Merge "Do no play hint animation when retrying auth" into qt-r1-dev am: dfba874730

am: 5b432e94f0

Change-Id: I9c98b0a041b902664584b964a21051a254072e67

1 files changed, 8 insertions, 5 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 186fd3793cb2..64a8ce029a7b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -2430,7 +2430,6 @@ public class NotificationPanelView extends PanelView implements
             onUnlockHintFinished();
             return;
         }
-        mUpdateMonitor.requestFaceAuth();
         super.startUnlockHintAnimation();
     }
 
@@ -2651,10 +2650,14 @@ public class NotificationPanelView extends PanelView implements
         switch (mBarState) {
             case StatusBarState.KEYGUARD:
                 if (!mDozingOnDown) {
-                    mLockscreenGestureLogger.write(
-                            MetricsEvent.ACTION_LS_HINT,
-                            0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */);
-                    startUnlockHintAnimation();
+                    if (mKeyguardBypassController.getBypassEnabled()) {
+                        mUpdateMonitor.requestFaceAuth();
+                    } else {
+                        mLockscreenGestureLogger.write(
+                                MetricsEvent.ACTION_LS_HINT,
+                                0 /* lengthDp - N/A */, 0 /* velocityDp - N/A */);
+                        startUnlockHintAnimation();
+                    }
                 }
                 return true;
             case StatusBarState.SHADE_LOCKED: