| commit | 9ccc5cffee208563e5a2bae24cecd34c80db9776 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jan 05 14:00:45 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 05 14:00:45 2022 +0000 |
| tree | e0ba3ebda9755ab08777b879f1d4e206230be8d4 | |
| parent | 8605801af5760d39551efbe158b8722a22babb3f [diff] | |
| parent | b92bc42153beb28d7737a0c124f7a935efe429ae [diff] |
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
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 ad1c232..98b5dcc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/BiometricUnlockController.java
@@ -645,7 +645,7 @@ 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 @@ && 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(); }