Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev

2021-09-13 13:52:26 +00:00
parent a1fbab88b0 36120b8a4c
commit 1ecc3166f0
2 changed files with 16 additions and 1 deletions
--- a/src/com/android/settings/password/ChooseLockGenericController.java
+++ b/src/com/android/settings/password/ChooseLockGenericController.java
@@ -190,7 +190,8 @@ public class ChooseLockGenericController {
     * requirements. The lock's visibility ({@link #isScreenLockVisible}) is not considered here.
     */
    public boolean isScreenLockEnabled(ScreenLockType type) {
-        return type.maxQuality >= upgradeQuality(PASSWORD_QUALITY_UNSPECIFIED);
+        return !mLockPatternUtils.isCredentialsDisabledForUser(mUserId)
+                && type.maxQuality >= upgradeQuality(PASSWORD_QUALITY_UNSPECIFIED);
    }

    /**