diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-25 00:44:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-25 00:44:56 +0000 |
| commit | 400988b69c2ee1e9e9502f12cbb407f1cc867da6 (patch) | |
| tree | 69af642ab33ec796fc685f65e5376c066dde9cae /services | |
| parent | 2ac0462e7bdf0f7cfc8163bfa31cf4a90161a879 (diff) | |
| parent | fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19 (diff) | |
| download | frameworks_base-400988b69c2ee1e9e9502f12cbb407f1cc867da6.zip frameworks_base-400988b69c2ee1e9e9502f12cbb407f1cc867da6.tar.gz frameworks_base-400988b69c2ee1e9e9502f12cbb407f1cc867da6.tar.bz2 | |
am fbb0796e: am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev
* commit 'fbb0796eb3bbbdfeb3218b9495a0f36f4cf4ed19':
Add test for attribute android:allowEmbedded
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 e044d3f..2c32d5d 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -710,6 +710,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) { |