Merge "Fix a crash during mock testing"

2022-10-24 21:57:00 +00:00
parent 646db04ef7 c185ae1c29
commit 0837296314
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/am/BroadcastQueueImpl.java
+++ b/services/core/java/com/android/server/am/BroadcastQueueImpl.java
@@ -1488,7 +1488,8 @@ public class BroadcastQueueImpl extends BroadcastQueue {
            // LocalServices.getService() here.
            final UserManagerInternal umInternal = LocalServices.getService(
                    UserManagerInternal.class);
-            final UserInfo userInfo = umInternal.getUserInfo(r.userId);
+            final UserInfo userInfo =
+                    (umInternal != null) ? umInternal.getUserInfo(r.userId) : null;
            if (userInfo != null) {
                userType = UserManager.getUserTypeForStatsd(userInfo.userType);
            }