commit 7f3ff133c19ed50dd245e025a44e1de7bcc3d38a
author Dianne Hackborn <hackbod@android.com> Sun May 26 07:22:21 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun May 26 07:22:21 2013 +0000
tree 82ce48765e995f8b369148ccfde29e5b8d350611
parent f46449abedcba2167fffa8ba8dc2f6d7a6d410b9
parent ad83c198a1151e054a0072e51cfb92b5dbe0061f

Merge "Fix wrong log information in DevicePolicyManagerService"

services/java/com/android/server/DevicePolicyManagerService.java

diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
index 6a62809..05f2004 100644
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -1638,7 +1638,7 @@
                 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;