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

Commit 3cdfcdc1 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

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

parents f52b6ede 95a6a96e

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