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

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

Change-Id: I0ae596f28d67e14153a1e8f3bc604b7cf79c2ed7
This commit is contained in:
TreeHugger Robot
2022-01-05 14:00:45 +00:00
committed by Automerger Merge Worker

View File

@@ -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();
}