summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@android.com> 2013-05-26 07:22:21 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2013-05-26 07:22:21 +0000
commit7f3ff133c19ed50dd245e025a44e1de7bcc3d38a (patch)
tree82ce48765e995f8b369148ccfde29e5b8d350611
parentf46449abedcba2167fffa8ba8dc2f6d7a6d410b9 (diff)
parentad83c198a1151e054a0072e51cfb92b5dbe0061f (diff)
Merge "Fix wrong log information in DevicePolicyManagerService"
-rw-r--r--services/java/com/android/server/DevicePolicyManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
index 6a62809f6fa0..05f200415e57 100644
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -1638,7 +1638,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
if (realQuality < quality
&& quality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {
Slog.w(TAG, "resetPassword: password quality 0x"
- + Integer.toHexString(quality)
+ + Integer.toHexString(realQuality)
+ " does not meet required quality 0x"
+ Integer.toHexString(quality));
return false;