diff options
author | Andrew Scull <ascull@google.com> | 2017-01-13 15:28:36 +0000 |
---|---|---|
committer | Adam Seaton <aseaton@google.com> | 2017-03-21 22:09:42 +0000 |
commit | 730cf1b83cc4f16c54ee3cb90f981dd5db7ef46d (patch) | |
tree | 050e38f20b346e0639937ea1e199321c15ba9075 | |
parent | af8fde449ee44b093dc004e05ac6bb4672919f21 (diff) | |
download | base-730cf1b83cc4f16c54ee3cb90f981dd5db7ef46d.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); |