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

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

am 6dffeb9e: am 8890013a: Merge "Add null check to embeddedAllowed check" into klp-modular-dev 

* commit '6dffeb9e':
  Add null check to embeddedAllowed check
parents 81850c48 6dffeb9e

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

+1 −1
Original line number Diff line number Diff line
@@ -3119,7 +3119,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                }

            }

            ActivityInfo aInfo = resolveActivity(intent, resolvedType, 0, null, null, userId);

            if ((aInfo.flags & ActivityInfo.FLAG_ALLOW_EMBEDDED) == 0) {

            if (aInfo != null && (aInfo.flags & ActivityInfo.FLAG_ALLOW_EMBEDDED) == 0) {

                throw new SecurityException(

                        "Attempt to embed activity that has not set allowEmbedded=\"true\"");

            }