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

am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev

Browse Source 
* commit '3359bbe02ca645bae2f495df51e7b4001de6c2b1':
  Add test for attribute android:allowEmbedded
This commit is contained in:
Craig Mautner
2014-04-25 00:42:25 +00:00
committed by Android Git Automerger
parent 02e857441f 3359bbe02c
commit fbb0796eb3
1 changed files with 4 additions and 0 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,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) {