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

Commit aeb09164 authored by Chad Brubaker's avatar Chad Brubaker Committed by Android (Google) Code Review
Browse files

Merge "No longer upgrade password quality based on keystore" into mnc-dev

parents bdc4e534 95e6fe0e

src/com/android/settings/ChooseLockGeneric.java

+0 −10
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
        /** increases the quality if necessary */

        private int upgradeQuality(int quality) {

            quality = upgradeQualityForDPM(quality);

            quality = upgradeQualityForKeyStore(quality);

            return quality;

        }
@@ -305,15 +304,6 @@ public class ChooseLockGeneric extends SettingsActivity { 
            return quality;

        }



        private int upgradeQualityForKeyStore(int quality) {

            if (!mKeyStore.isEmpty()) {

                if (quality < CredentialStorage.MIN_PASSWORD_QUALITY) {

                    quality = CredentialStorage.MIN_PASSWORD_QUALITY;

                }

            }

            return quality;

        }



        /***

         * Disables preferences that are less secure than required quality. The actual

         * implementation is in disableUnusablePreferenceImpl.