summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-06-24 16:35:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-06-24 16:35:42 +0000
commitf67706c43a524847d2495d1583ca97224931d3e4 (patch)
tree9672b871d282a4063fd2e235e4559dd469f79fca
parenta0f26da016868362b5dc4dc630ceaf47119f7303 (diff)
parentf4976b31f459c7c909fe4775e7c2c155b8a2a611 (diff)
Merge "Retry auth during tap on lock screen." into qt-r1-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java4
1 files changed, 4 insertions, 0 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 029d6b3c4899..b1b9ebcc3cdc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -56,6 +56,7 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.keyguard.KeyguardClockSwitch;
import com.android.keyguard.KeyguardStatusView;
+import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.systemui.DejankUtils;
import com.android.systemui.Dependency;
import com.android.systemui.Interpolators;
@@ -154,6 +155,7 @@ public class NotificationPanelView extends PanelView implements
private final NotificationWakeUpCoordinator mWakeUpCoordinator;
private final PulseExpansionHandler mPulseExpansionHandler;
private final KeyguardBypassController mKeyguardBypassController;
+ private final KeyguardUpdateMonitor mUpdateMonitor;
@VisibleForTesting
protected KeyguardAffordanceHelper mAffordanceHelper;
@@ -382,6 +384,7 @@ public class NotificationPanelView extends PanelView implements
});
mThemeResId = context.getThemeResId();
mKeyguardBypassController = bypassController;
+ mUpdateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
dynamicPrivacyController.addListener(this);
mBottomAreaShadeAlphaAnimator = ValueAnimator.ofFloat(1f, 0);
@@ -2427,6 +2430,7 @@ public class NotificationPanelView extends PanelView implements
onUnlockHintFinished();
return;
}
+ mUpdateMonitor.requestFaceAuth();
super.startUnlockHintAnimation();
}