diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-25 00:39:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-25 00:39:06 +0000 |
| commit | 3359bbe02ca645bae2f495df51e7b4001de6c2b1 (patch) | |
| tree | db6135a834f75fdeb5364d40f825faefb0833a59 /services | |
| parent | 3cb4430b071e9e978853f73c0cccd15dc2f37a49 (diff) | |
| parent | 75731016e9231cc867e99a3d9269fc16c8f3f606 (diff) | |
| download | frameworks_base-3359bbe02ca645bae2f495df51e7b4001de6c2b1.zip frameworks_base-3359bbe02ca645bae2f495df51e7b4001de6c2b1.tar.gz frameworks_base-3359bbe02ca645bae2f495df51e7b4001de6c2b1.tar.bz2 | |
Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStackSupervisor.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 0b6f7d1..9240b84 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -705,6 +705,10 @@ public final class ActivityStackSupervisor implements DisplayListener { profileFile, profileFd, userId); ActivityContainer container = (ActivityContainer)iContainer; + if (container != null && (aInfo.flags & ActivityInfo.FLAG_ALLOW_EMBEDDED) == 0) { + throw new SecurityException( + "Activities launched in ActivityContainers must set allowEmbedded=\"true\""); + } synchronized (mService) { int callingPid; if (callingUid >= 0) { |