Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 951af9e1 authored by Jigar Thakkar's avatar Jigar Thakkar
Browse files

Ensure main user is not null before registering settings observer 

In the previous change we added settings observer on the main user to
listen to autolock preference changes. However, auto-devices do not have
main user and hence getMainUser() will return null. This can cause
failures while registering for the settings observer. This changes fixes
this issue by adding null checks before registering the observer.

Test: Tested manually
Bug: 321084663
Change-Id: I29e9c5a03fbf9c6587db7a6f132f7f70204dc012
parent a5eafaaf

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();

    }