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

Commit 8890013a authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Add null check to embeddedAllowed check" into klp-modular-dev

parents 20d125de 05678d5a

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

+1 −1
Original line number Diff line number Diff line
@@ -3068,7 +3068,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\"");

            }