Merge "Add null check to embeddedAllowed check" into klp-modular-dev

2014-05-05 20:55:48 +00:00
parent 20d125dedb 05678d5a31
commit 8890013ae0
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -3068,7 +3068,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
                }
            }
            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\"");
            }