diff options
| author | Craig Mautner <cmautner@google.com> | 2014-05-05 20:55:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-05 20:55:48 +0000 |
| commit | 8890013ae0473663a6b9591db6230e9038ba6711 (patch) | |
| tree | c22b9d413ccd36ece1850fb09939a6981713db8d | |
| parent | 20d125dedb8bde016389ee97a0cefcc97bb02a81 (diff) | |
| parent | 05678d5a3136a747a2e7eaccca0ad148c52a2d00 (diff) | |
| download | frameworks_base-8890013ae0473663a6b9591db6230e9038ba6711.zip frameworks_base-8890013ae0473663a6b9591db6230e9038ba6711.tar.gz frameworks_base-8890013ae0473663a6b9591db6230e9038ba6711.tar.bz2 | |
Merge "Add null check to embeddedAllowed check" into klp-modular-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 28b1df5..5e45917 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 @@ 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\""); } |