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

Commit 1b0d221b authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Load owner info during DevicePolicyManagerSerivce construction" into rvc-dev am: 8d357b55 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11680847

Change-Id: I46ad1659490d02bd5a1ec5cab4849330919d4512
parents 39c6d86a 8d357b55

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

+17 −2
Original line number Diff line number Diff line
@@ -2616,6 +2616,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        mSetupContentObserver = new SetupContentObserver(mHandler);















        mUserManagerInternal.addUserRestrictionsListener(new RestrictionsListener(mContext));

























        loadOwners();















    }





























    /**










@@ -2676,12 +2678,23 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        }















    }



























    /**













     * Load information about device and profile owners of the device, populating mOwners and













     * pushing owner info to other system services. This is called at a fairly early stage of













     * system server initialiation (via DevicePolicyManagerService's ctor), so care should to













     * be taken to not interact with system services that are initialiated after DPMS.













     * onLockSettingsReady() is a safer place to do initialization work not critical during













     * the first boot stage.













     * Note this only loads the list of owners, and not their actual policy (DevicePolicyData).













     * The policy is normally loaded lazily when it's first accessed. In several occasions













     * the list of owners is necessary for providing callers with aggregated policies across













     * multiple owners, hence the owner list is loaded as part of DPMS's construction here.













     */















    void loadOwners() {















        synchronized (getLockObject()) {















            mOwners.load();















            setDeviceOwnershipSystemPropertyLocked();















            findOwnerComponentIfNecessaryLocked();













            migrateUserRestrictionsIfNecessaryLocked();





























            // TODO PO may not have a class name either due to b/17652534.  Address that too.















            updateDeviceOwnerLocked();










@@ -4104,8 +4117,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













    }





























    private void onLockSettingsReady() {













        synchronized (getLockObject()) {













            migrateUserRestrictionsIfNecessaryLocked();













        }















        getUserData(UserHandle.USER_SYSTEM);













        loadOwners();















        cleanUpOldUsers();















        maybeSetDefaultProfileOwnerUserRestrictions();















        handleStartUser(UserHandle.USER_SYSTEM);