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

Commit 2f6c9eb9 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Check for null ActivityInfo. 

Bug: 5970556
Change-Id: I87ebad1918311f24333d16cb6732742a1dd96685
parent 041a434d

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;















        }