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

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

Merge "Check for null ActivityInfo."

parents 5bd41b29 2f6c9eb9

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

+2 −1
Original line number Diff line number Diff line
@@ -15253,6 +15253,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
    }















    private ApplicationInfo getAppInfoForUser(ApplicationInfo info, int userId) {













        if (info == null) return null;















        ApplicationInfo newInfo = new ApplicationInfo(info);















        newInfo.uid = applyUserId(info.uid, userId);















        if (newInfo.uid >= Process.FIRST_APPLICATION_UID) {









@@ -15263,7 +15264,7 @@ public final class ActivityManagerService extends ActivityManagerNative













    }





























    ActivityInfo getActivityInfoForUser(ActivityInfo aInfo, int userId) {













        if (aInfo.applicationInfo.uid < Process.FIRST_APPLICATION_UID













        if (aInfo == null || aInfo.applicationInfo.uid < Process.FIRST_APPLICATION_UID















                || userId < 1) {















            return aInfo;















        }