diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java index 808ba544eb5e3..39620ac231173 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java @@ -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(); }