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

Commit adbda747 authored by Kenny Guy's avatar Kenny Guy
Browse files

Fix issue with saving admins before finishing loading. 

Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.

Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services

Bug: 34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
parent ebf7abb1

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);