diff options
| author | Adrian Roos <roosa@google.com> | 2015-01-07 22:39:01 +0100 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2015-01-08 13:53:52 +0100 |
| commit | dce0122ea2d27474890d5e18ba4b7e4d06303e53 (patch) | |
| tree | 3beb243c45358943f159da32a091d14e35318976 /services/devicepolicy/java | |
| parent | db0f76e1d85f8cb878a9540ac1b692636f9fd89e (diff) | |
| download | frameworks_base-dce0122ea2d27474890d5e18ba4b7e4d06303e53.zip frameworks_base-dce0122ea2d27474890d5e18ba4b7e4d06303e53.tar.gz frameworks_base-dce0122ea2d27474890d5e18ba4b7e4d06303e53.tar.bz2 | |
Explicitly specify user on LPU's private methods
Also fixes a bug in DevicePolicyManagerService where
the wrong user was used.
Bug: 18931518
Change-Id: I7ae8ecfdb1c835cdee7eafa2b96e1ec8b712977b
Diffstat (limited to 'services/devicepolicy/java')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 54a9bc0..4860321 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -1497,11 +1497,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // a sanity check in case the two get out of sync; this should // never normally happen. LockPatternUtils utils = new LockPatternUtils(mContext); - if (utils.getActivePasswordQuality() < policy.mActivePasswordQuality) { + if (utils.getActivePasswordQuality(userHandle) < policy.mActivePasswordQuality) { Slog.w(LOG_TAG, "Active password quality 0x" + Integer.toHexString(policy.mActivePasswordQuality) + " does not match actual quality 0x" - + Integer.toHexString(utils.getActivePasswordQuality())); + + Integer.toHexString(utils.getActivePasswordQuality(userHandle))); policy.mActivePasswordQuality = DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; policy.mActivePasswordLength = 0; policy.mActivePasswordUpperCase = 0; |