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

Commit e94eb4e5 authored by Amith Yamasani's avatar Amith Yamasani Committed by The Android Automerger
Browse files

Fix an NPE when launching an activity that's not found. 

Bug: 6356194
Change-Id: I66aeeda3ecab36a4aa32fb78c1d0559a73cd9a7a
parent 12515ff4

services/java/com/android/server/am/ActivityStack.java

+1 −1
Original line number Diff line number Diff line
@@ -2944,7 +2944,7 @@ final class ActivityStack { 
        // Collect information about the target of the Intent.

        ActivityInfo aInfo = resolveActivity(intent, resolvedType, startFlags,

                profileFile, profileFd, userId);

        if (mService.isSingleton(aInfo.processName, aInfo.applicationInfo)) {

        if (aInfo != null && mService.isSingleton(aInfo.processName, aInfo.applicationInfo)) {

            userId = 0;

        }

        aInfo = mService.getActivityInfoForUser(aInfo, userId);