Merge "Rescan face when user preses empty space on LS" into sc-dev

2021-07-29 12:49:28 +00:00
parent 11f74e42a5 63bca4985b
commit 866753754b
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,