drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Too soon." into klp-modular-dev

Browse Source
This commit is contained in:
Craig Mautner
2014-04-25 03:03:37 +00:00
committed by Android (Google) Code Review
parent 3359bbe02c 2e46e65e9d
commit 3a656ea32e
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); profileFile, profileFd, userId);
ActivityContainer container = (ActivityContainer)iContainer; 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) { synchronized (mService) {
int callingPid; int callingPid;
if (callingUid >= 0) { if (callingUid >= 0) {