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

Commit 55270868 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Move policy upgrade to DPMS ctor"

parents 665ce344 9ad78eae

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

+2 −1
Original line number Diff line number Diff line
@@ -1833,6 +1833,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        mUserManagerInternal.addUserLifecycleListener(new UserLifecycleListener());















        loadOwners();

























        performPolicyVersionUpgrade();















    }





























    /**










@@ -3159,7 +3161,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        synchronized (getLockObject()) {















            migrateUserRestrictionsIfNecessaryLocked();















            fixupAutoTimeRestrictionDuringOrganizationOwnedDeviceMigration();













            performPolicyVersionUpgrade();















        }















        getUserData(UserHandle.USER_SYSTEM);















        cleanUpOldUsers();