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: If761e12e7f781415de9430412b88c4c43d431742
2021-07-30 00:46:40 +00:00
parent cb50fcf99b 866753754b
commit fe3a59a636
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
@@ -3298,7 +3298,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,