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

Commit 9ccc5cff authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Wake-up device before showing bouncer from AoD" into sc-v2-dev am: b92bc421 

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

Change-Id: I0ae596f28d67e14153a1e8f3bc604b7cf79c2ed7
parents 8605801a b92bc421

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

+3 −2
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
        if (biometricSourceType.equals(BiometricSourceType.FINGERPRINT)

                && mUpdateMonitor.isUdfpsSupported()

                && mNumConsecutiveFpFailures >= FP_ATTEMPTS_BEFORE_SHOW_BOUNCER) {

            mKeyguardViewController.showBouncer(true);

            startWakeAndUnlock(MODE_SHOW_BOUNCER);

            UI_EVENT_LOGGER.log(BiometricUiEvent.BIOMETRIC_BOUNCER_SHOWN);

            mNumConsecutiveFpFailures = 0;

        }
@@ -668,7 +668,8 @@ public class BiometricUnlockController extends KeyguardUpdateMonitorCallback imp 
                && mUpdateMonitor.isUdfpsSupported()

                && (mStatusBarStateController.getState() == StatusBarState.SHADE

                    || mStatusBarStateController.getState() == StatusBarState.SHADE_LOCKED)) {

            mKeyguardViewController.showBouncer(true);

            startWakeAndUnlock(MODE_SHOW_BOUNCER);

            UI_EVENT_LOGGER.log(BiometricUiEvent.BIOMETRIC_BOUNCER_SHOWN);

        }

        cleanup();

    }