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

Commit 04c2f3f2 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Fix issue with saving admins before finishing loading. am: adbda747"... 

Merge "Fix issue with saving admins before finishing loading. am: adbda747" into nyc-mr2-dev-plus-aosp
parents a199722e 4cccc791

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

+3 −3
Original line number Diff line number Diff line
@@ -2567,14 +2567,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);