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

Commit 05678d5a authored by Craig Mautner's avatar Craig Mautner
Browse files

Add null check to embeddedAllowed check 

If the component being checked has been removed an NPE will be
thrown. This checks for that situation and handles it.

Fixes bug 14562234.

Change-Id: Ica5713378f356ac8441862d455b7d284ea111212
parent 1edfd835

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\"");

            }