Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Never play face errors for co-ex" into tm-d1-dev am: 4d2b126284

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18868864

Change-Id: I2086f2d93dfba747b75a064dcb4be3c9d2c96c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2022-06-13 20:57:17 +00:00
committed by Automerger Merge Worker
parent cb0c76f1e0 4d2b126284
commit 1aad4b2a1e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
View File

@@ -676,7 +676,10 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
}
}
if (biometricSourceType == BiometricSourceType.FACE) {
// Suppress all face auth errors if fingerprint can be used to authenticate
if (biometricSourceType == BiometricSourceType.FACE
&& !mUpdateMonitor.getCachedIsUnlockWithFingerprintPossible(
KeyguardUpdateMonitor.getCurrentUser())) {
vibrateError();
}
@@ -703,10 +706,6 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp
UI_EVENT_LOGGER.log(BiometricUiEvent.BIOMETRIC_BOUNCER_SHOWN, getSessionId());
}
if (biometricSourceType == BiometricSourceType.FACE) {
vibrateError();
}
cleanup();
}