Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbb0796e authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit '3359bbe0':
  Add test for attribute android:allowEmbedded
parents 02e85744 3359bbe0

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

+4 −0
Original line number Diff line number Diff line
@@ -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) {