| commit | f806d65e615b942c268a5f68d44bde9d55634972 | [log] [tgz] |
|---|---|---|
| author | Andrew Scull <[email protected]> | Fri Jan 13 15:28:36 2017 +0000 |
| committer | Adam Seaton <[email protected]> | Tue Mar 21 13:52:40 2017 -0700 |
| tree | 2963e9920bfd1d9bdf0a54320d11b0eb4bbc9dce | |
| parent | 6422e8fb4429936477f2cac82c472e5e4684f26d [diff] |
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev fix conflict in nyc-mr2-release Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index e3b6ecc..f61429f 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -2578,14 +2578,14 @@ // 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);