diff options
author | Andrew Scull <ascull@google.com> | 2017-01-13 15:28:36 +0000 |
---|---|---|
committer | Adam Seaton <aseaton@google.com> | 2017-03-23 17:14:17 +0000 |
commit | aeefec3f9d739140886a09036380574128aa5659 (patch) | |
tree | c2c939a9c83c7c2246f3e98d64f8b486bb5a6d1c | |
parent | b4062880f6dad0facf41a87a24cb0e0f17558e20 (diff) | |
download | base-aeefec3f9d739140886a09036380574128aa5659.tar.gz |
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev
fix conflict in nyc-mr2-release
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
-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 6c31e6725991..b69260897b71 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); |