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

Commit 688b5f4f authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Cleanup: rename loadDeviceOwner() to loadOwners()"

parents 2cea8d4b f024f048

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1132,7 +1132,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        updateScreenCaptureDisabledInWindowManager(userHandle, false /* default value */);

    }



    void loadDeviceOwner() {

    void loadOwners() {

        synchronized (this) {

            mOwners.load();

            updateDeviceOwnerLocked();
@@ -1790,7 +1790,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


    private void onLockSettingsReady() {

        getUserData(UserHandle.USER_OWNER);

        loadDeviceOwner();

        loadOwners();

        cleanUpOldUsers();

        // Register an observer for watching for user setup complete.

        new SetupContentObserver(mHandler).register(mContext.getContentResolver());