commit 2bfbcfae13afd00b7e7e28031a9bda5f7de753f8
author Tony Mak <tonymak@google.com> Fri Mar 18 18:51:58 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 18 18:51:58 2016 +0000
tree 140c8c3253fb7e2e975134b7eeb0d6a4a19356b8
parent b27d5b2007020e9911aaab57161bced168d3b99c
parent 25c3c54c03dab4bd14dbe92ac48e85df9c15bd68

Merge "Should read specific user's password restriction" into nyc-dev

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index ed1d0dd..3d5e271 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -393,7 +393,7 @@
 
         private int upgradeQualityForDPM(int quality) {
             // Compare min allowed password quality
-            int minQuality = mDPM.getPasswordQuality(null);
+            int minQuality = mDPM.getPasswordQuality(null, mUserId);
             if (quality < minQuality) {
                 quality = minQuality;
             }
@@ -422,7 +422,7 @@
                 boolean hideDisabled) {
             final PreferenceScreen entries = getPreferenceScreen();
 
-            int adminEnforcedQuality = mDPM.getPasswordQuality(null);
+            int adminEnforcedQuality = mDPM.getPasswordQuality(null, mUserId);
             EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
                     getActivity(), mUserId);
             for (int i = entries.getPreferenceCount() - 1; i >= 0; --i) {
@@ -592,7 +592,7 @@
             Intent intent = null;
             final Context context = getActivity();
             if (quality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC) {
-                int minLength = mDPM.getPasswordMinimumLength(null);
+                int minLength = mDPM.getPasswordMinimumLength(null, mUserId);
                 if (minLength < MIN_PASSWORD_LENGTH) {
                     minLength = MIN_PASSWORD_LENGTH;
                 }