Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with saving admins before finishing loading.

Browse Source 
am: f98ed6863a

Change-Id: I7f816c164548df86f9607c86772902efd0d53620
This commit is contained in:
Kenny Guy
2017-01-18 17:13:31 +00:00
committed by android-build-merger
parent ea9463f542 f98ed6863a
commit b275a205af
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -2466,14 +2466,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
// Ignore // 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 // Might need to upgrade the file by rewriting it
if (needsRewrite) { if (needsRewrite) {
saveSettingsLocked(userHandle); saveSettingsLocked(userHandle);
} }
// Generate a list of admins from the admin map
policy.mAdminList.addAll(policy.mAdminMap.values());
validatePasswordOwnerLocked(policy); validatePasswordOwnerLocked(policy);
updateMaximumTimeToLockLocked(userHandle); updateMaximumTimeToLockLocked(userHandle);
updateLockTaskPackagesLocked(policy.mLockTaskPackages, userHandle); updateLockTaskPackagesLocked(policy.mLockTaskPackages, userHandle);