Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '3a656ea32e6d6489f4bc45884e5acede9fe2de51':
  Too soon.
This commit is contained in:
Craig Mautner
2014-04-25 03:06:34 +00:00
committed by Android Git Automerger
parent 7466e3bbbd 3a656ea32e
commit e5889679f6
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -705,10 +705,6 @@ 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) {