Merge "Never play face errors for co-ex" into tm-d1-dev

2022-06-13 20:23:10 +00:00
parent 4f89921b4a d969a1057a
commit 4d2b126284
1 changed files with 4 additions and 5 deletions
--- 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();
    }