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

Commit 19960ebe authored by Adnan Begovic's avatar Adnan Begovic Committed by Danny Baumann
Browse files

am: Handle potential NPE when activity info can't be resolved. 

Change-Id: Ia7fff6ded8686efb8657b401107f706a8820b959
TICKET: CYNGNOS-1803
parent 50b5623c

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

+6 −0
Original line number Diff line number Diff line
@@ -2185,6 +2185,12 @@ public final class ActivityManagerService extends ActivityManagerNative 
                ActivityInfo root = resolveActivityInfo(targetIntent, targetIntent.getFlags(),

                        targetUserId);













                if (root == null) {













                    Slog.w(ActivityManagerService.TAG,













                            "No activity info found for given intent " + targetIntent.toString());













                    return;













                }



























                try {















                    Intent protectedAppIntent = new Intent();















                    protectedAppIntent.setComponent(