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-19 16:51:14 -0800 |
| commit | 7261a926a5b6b08a35d937bb922651a5d7f7e725 (patch) | |
| tree | f190784ce15d938c601c9fd019490191e95fa20b | |
| parent | 618391bd7cd5d3026636af32155db7ad5f3e953b (diff) | |
| download | base-7261a926a5b6b08a35d937bb922651a5d7f7e725.tar.gz | |
Fix issue with saving admins before finishing loading.android-7.1.1_r28
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); |