Merge "Rescan face when user preses empty space on LS" into sc-dev am: 866753754b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15412658 Change-Id: I5541cd5093df0236b6ce9e52046d82b77b3c801d
2021-07-29 13:04:58 +00:00
parent bc963b8701 866753754b
commit 847acc3926
1 changed files with 4 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
@@ -3248,7 +3248,10 @@ public class NotificationPanelViewController extends PanelViewController {
        switch (mBarState) {
            case KEYGUARD:
                if (!mDozingOnDown) {
-                    if (mKeyguardBypassController.getBypassEnabled()) {
+                    if (mUpdateMonitor.isFaceEnrolled()
+                            && !mUpdateMonitor.isFaceDetectionRunning()
+                            && !mUpdateMonitor.getUserCanSkipBouncer(
+                                    KeyguardUpdateMonitor.getCurrentUser())) {
                        mUpdateMonitor.requestFaceAuth(true);
                    } else {
                        mLockscreenGestureLogger.write(MetricsEvent.ACTION_LS_HINT,