Merge "Ensure main user is not null before registering settings observer" into main (0297bd45) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserManagerService.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -1023,8 +1023,9 @@ public class UserManagerService extends IUserManager.Stub {
		if (isAutoLockForPrivateSpaceEnabled()) {

		int mainUserId = getMainUserIdUnchecked();

		mContext.getContentResolver().registerContentObserverAsUser(Settings.Secure.getUriFor(
		if (mainUserId != UserHandle.USER_NULL) {
		mContext.getContentResolver().registerContentObserverAsUser(
		Settings.Secure.getUriFor(
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK), false,
		mPrivateSpaceAutoLockSettingsObserver, UserHandle.of(mainUserId));

		@@ -1033,6 +1034,7 @@ public class UserManagerService extends IUserManager.Stub {
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK,
		Settings.Secure.PRIVATE_SPACE_AUTO_LOCK_NEVER, mainUserId));
		}
		}

		markEphemeralUsersForRemoval();
		}