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

Commit 18946328 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 am: b275a205 

am: ee9f03d1

Change-Id: Ic724588cbab8d4282eeb5bc806f8c67791189a05
parents 1876583b ee9f03d1

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

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

            // 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

        // Might need to upgrade the file by rewriting it

        if (needsRewrite) {

        if (needsRewrite) {

            saveSettingsLocked(userHandle);

            saveSettingsLocked(userHandle);

        }

        }





        // Generate a list of admins from the admin map

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



        validatePasswordOwnerLocked(policy);

        validatePasswordOwnerLocked(policy);

        updateMaximumTimeToLockLocked(userHandle);

        updateMaximumTimeToLockLocked(userHandle);

        updateLockTaskPackagesLocked(policy.mLockTaskPackages, userHandle);

        updateLockTaskPackagesLocked(policy.mLockTaskPackages, userHandle);