Check for null ActivityInfo.

Bug: 5970556
Change-Id: I87ebad1918311f24333d16cb6732742a1dd96685

1 files changed, 2 insertions, 1 deletions

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 6fd5c07362ec..e6a1e68717fb 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -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;
         }