Merge "Check for null ActivityInfo."
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 6fd5c07..e6a1e68 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -15253,6 +15253,7 @@
}
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 @@
}
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;
}