summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/am/ActivityStackSupervisor.java4
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 0b6f7d155d17..9240b84ebcdd 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) {