Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54e28378 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

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

Merge "Never play face errors for co-ex" into tm-d1-dev am: 4d2b1262 am: 9001f554 am: 09360f5b

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



Change-Id: I2ab0a1d3b62b277b95d2217585f4d02ab645a4c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e0971ce 09360f5b

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

+4 −5
Original line number Diff line number Diff line
@@ -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();

    }