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

Merge "Fix issue with saving admins before finishing loading. am: adbda7474c" into nyc-mr2-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-01-18 01:32:26 +00:00
committed by Android (Google) Code Review
parent a199722ed6 4cccc791f4
commit 04c2f3f2df
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

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