UserManagerService: Fix NPE

wangshouchun · Genkzsz11 · commit ba84cac07aae · 2021-05-11T04:33:29.000+07:00
Bug:172868901
Test:manual verification

device reboot once for UserInfo is null

Signed-off-by: wangshouchun &lt;wangshouchun@xiaomi.com&gt;
Change-Id: Iddb3eb077ce06fdb1be63ca34ebf8fe2e64f2638
Signed-off-by: DennySPb &lt;dennyspb@gmail.com&gt;
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -5183,6 +5183,9 @@ public boolean isProfileAccessible(int callingUserId, int targetUserId, String d
                                 debugMsg + " for another profile "
                                         + targetUserId + " from " + callingUserId);
                     }
+                    Slog.w(LOG_TAG, debugMsg + " for another profile "
+                            + targetUserId + " from " + callingUserId);
+                    return false;
                 }
 
                 UserInfo targetUserInfo = getUserInfoLU(targetUserId);

Original file line number	Diff line number	Diff line change
`@@ -5183,6 +5183,9 @@ public boolean isProfileAccessible(int callingUserId, int targetUserId, String d`
`5183`	`5183`	`debugMsg + " for another profile "`
`5184`	`5184`	`+ targetUserId + " from " + callingUserId);`
`5185`	`5185`	`}`
	`5186`	`+ Slog.w(LOG_TAG, debugMsg + " for another profile "`
	`5187`	`+ + targetUserId + " from " + callingUserId);`
	`5188`	`+ return false;`
`5186`	`5189`	`}`
`5187`	`5190`
`5188`	`5191`	`UserInfo targetUserInfo = getUserInfoLU(targetUserId);`