Merge "Lazily get UserManager to avoid NPE" into main (2840fcbf) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3002,7 +3002,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		\|\| mLastResumedActivity == null) {
		return;
		}
		var userInfo = mUserManager.getUserInfo(mLastResumedActivity.mUserId);
		var userInfo = getUserManager().getUserInfo(mLastResumedActivity.mUserId);
		if (userInfo == null \|\| !userInfo.isManagedProfile()) {
		return;
		}