commit 2840fcbf60a3ffb1a57669a15d7525f5e9c43276
author Zach Lee <leezach@google.com> Wed Oct 18 16:10:06 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 18 16:10:06 2023 +0000
tree 819109abd738ef0d8e77d3b7ef1bf643809a3ff7
parent 56d8ba6b12e9f972930e4d73681d39d5c8117cad
parent 8eb624a47ac8608b45ad00d5cffd53d3dc40d562

Merge "Lazily get UserManager to avoid NPE" into main

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index de335d3..c021785 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -3002,7 +3002,7 @@
                 || mLastResumedActivity == null) {
             return;
         }
-        var userInfo = mUserManager.getUserInfo(mLastResumedActivity.mUserId);
+        var userInfo = getUserManager().getUserInfo(mLastResumedActivity.mUserId);
         if (userInfo == null || !userInfo.isManagedProfile()) {
             return;
         }