From 25c3c54c03dab4bd14dbe92ac48e85df9c15bd68 Mon Sep 17 00:00:00 2001
From: Tony Mak <tonymak@google.com>
Date: Fri, 18 Mar 2016 13:48:16 +0000
Subject: [PATCH] Should read specific user's password restriction

Bug: 27330307
Bug: 27543548

Change-Id: I385d190bdd8138f7189c657498f6a55bf84668ea
---
 src/com/android/settings/ChooseLockGeneric.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index ed1d0dd47f7..3d5e27148ef 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -393,7 +393,7 @@ public class ChooseLockGeneric extends SettingsActivity {
 
         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 @@ public class ChooseLockGeneric extends SettingsActivity {
                 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 @@ public class ChooseLockGeneric extends SettingsActivity {
             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;
                 }