Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25c3c54c authored by Tony Mak's avatar Tony Mak
Browse files

Should read specific user's password restriction 

Bug: 27330307
Bug: 27543548

Change-Id: I385d190bdd8138f7189c657498f6a55bf84668ea
parent 47a9d4f7

src/com/android/settings/ChooseLockGeneric.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

                }