commit e5889679f69c93f85bca9e94710d5e60a0b1a629
author Craig Mautner <cmautner@google.com> Fri Apr 25 03:06:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 25 03:06:34 2014 +0000
tree c0630f9bb5bb6acf64e4012d4d86c3f5a2a87eca
parent 7466e3bbbd13b563e1a5adcc537ea0f132045038
parent 3a656ea32e6d6489f4bc45884e5acede9fe2de51

am 3a656ea3: Merge "Too soon." into klp-modular-dev

* commit '3a656ea32e6d6489f4bc45884e5acede9fe2de51':
  Too soon.

services/core/java/com/android/server/am/ActivityStackSupervisor.java

diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index 9240b84..0b6f7d1 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -705,10 +705,6 @@
                 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) {