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. am: f98ed6863a

Browse Source 
am: b275a205af

Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
This commit is contained in:
Kenny Guy
2017-01-18 17:27:10 +00:00
committed by android-build-merger
parent 332762aaf0 b275a205af
commit ee9f03d1ed
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

@@ -2498,14 +2498,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);