PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev am: 1ecc3166f0 am: fc67167c93

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778274

Change-Id: Ic295385f6cb70c2caecff6679336dd757cde513b
This commit is contained in:
Pavel Grafov
2021-09-13 14:18:44 +00:00
committed by Automerger Merge Worker
parent c90ae857d8 fc67167c93
commit 0e72224c38
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/password/ChooseLockGenericController.java
View File

@@ -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);
}
/**