commit e88097bd00d5710bbfb6c24a934743c8d6cac9cf
author Craig Mautner <cmautner@google.com> Mon May 05 20:58:15 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 05 20:58:15 2014 +0000
tree c32705842bb570566cb16f8d0637c880aa34b617
parent 8890013ae0473663a6b9591db6230e9038ba6711
parent d13a5583971a5905ac2ec240282383bde96fc25e

Merge "Pause and resume ActivityView when visibility changes" into klp-modular-dev

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index bc88a7d..e942afb 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3068,7 +3068,7 @@
                 }
             }
             ActivityInfo aInfo = resolveActivity(intent, resolvedType, 0, null, null, userId);
-            if ((aInfo.flags & ActivityInfo.FLAG_ALLOW_EMBEDDED) == 0) {
+            if (aInfo != null && (aInfo.flags & ActivityInfo.FLAG_ALLOW_EMBEDDED) == 0) {
                 throw new SecurityException(
                         "Attempt to embed activity that has not set allowEmbedded=\"true\"");
             }