diff options
| author | Kenny Guy <kennyguy@google.com> | 2017-01-17 23:33:41 +0000 |
|---|---|---|
| committer | android-merger <android-merger@vpba3.mtv.corp.google.com> | 2017-01-20 10:46:29 -0800 |
| commit | 6bc7cf9d8e3a688945fbf9bbe18f774b576d25f3 (patch) | |
| tree | a032a4eb9efd145681d804dea4aec81b8c9da5d4 | |
| parent | 1532f812e7fb1fea89d48c1f682d3371b1f4d9f7 (diff) | |
| download | base-android-7.1.1_r25.tar.gz | |
Fix issue with saving admins before finishing loading.android-7.1.1_r26android-7.1.1_r25
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
(cherry picked from commit adbda7474cc1968b66e9948aee566dc346e71340)
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index fbb865bc64a9..43168660a316 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -2498,14 +2498,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); |