tag 452aaf6bb07f999309e28195bd96a4dabe43f30e
tagger The Android Open Source Project <initial-contribution@android.com> Tue Jul 17 15:36:02 2018 -0700
object 58552f814a03d978b4a6507f3c16f71964f9b28f

Android CTS 7.1 Release 19 (4844155)

commit 58552f814a03d978b4a6507f3c16f71964f9b28f
author Kenny Guy <kennyguy@google.com> Tue Jan 17 23:33:41 2017 +0000
committer The Android Automerger <android-build@android.com> Mon Jan 23 11:44:58 2017 -0800
tree a240dcf55e6efecb4b9a696c2d014b507e95a447
parent 5494d68d465fe9326618f3ed88127f6401e0711a

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
(cherry picked from commit adbda7474cc1968b66e9948aee566dc346e71340)
(cherry picked from commit f98ed6863a7f64c535a66006852a934b05d550bc)