From 75731016e9231cc867e99a3d9269fc16c8f3f606 Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Thu, 24 Apr 2014 08:42:32 -0700
Subject: [PATCH] Add test for attribute android:allowEmbedded

Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().

Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332
---
 .../java/com/android/server/am/ActivityStackSupervisor.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 0b6f7d155d179..9240b84ebcdd2 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) {