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

Commit 2bfbcfae authored by Tony Mak's avatar Tony Mak Committed by Android (Google) Code Review
Browse files

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

parents b27d5b20 25c3c54c

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;

                }