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

Commit b275a205 authored by Kenny Guy's avatar Kenny Guy Committed by android-build-merger
Browse files

Fix issue with saving admins before finishing loading. 

am: f98ed686

Change-Id: I7f816c164548df86f9607c86772902efd0d53620
parents ea9463f5 f98ed686

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

+3 −3
Original line number Diff line number Diff line
@@ -2466,14 +2466,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            // Ignore

        }



        // Generate a list of admins from the admin map

        policy.mAdminList.addAll(policy.mAdminMap.values());



        // Might need to upgrade the file by rewriting it

        if (needsRewrite) {

            saveSettingsLocked(userHandle);

        }



        // Generate a list of admins from the admin map

        policy.mAdminList.addAll(policy.mAdminMap.values());



        validatePasswordOwnerLocked(policy);

        updateMaximumTimeToLockLocked(userHandle);

        updateLockTaskPackagesLocked(policy.mLockTaskPackages, userHandle);