From f3593a976fc4a25061c5b847af27ea3836fe72cb Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Thu, 16 Sep 2021 13:00:12 -0400
Subject: [PATCH] Show `swipe up to open` message on faceAuth from AOD2

Previously the message was dropped.

Test: manual
Fixes: 199221758
Change-Id: I990debae712193a6905b618eda9311c2e9582c6c
---
 .../systemui/statusbar/KeyguardIndicationController.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 445715e138ab8..7b41f777020c1 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -798,7 +798,9 @@ public class KeyguardIndicationController {
      * Show message on the keyguard for how the user can unlock/enter their device.
      */
     public void showActionToUnlock() {
-        if (mDozing) {
+        if (mDozing
+                && !mKeyguardUpdateMonitor.getUserCanSkipBouncer(
+                        KeyguardUpdateMonitor.getCurrentUser())) {
             return;
         }
 
@@ -809,7 +811,7 @@ public class KeyguardIndicationController {
                 String message = mContext.getString(R.string.keyguard_retry);
                 mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);
             }
-        } else if (mKeyguardUpdateMonitor.isScreenOn()) {
+        } else {
             showTransientIndication(mContext.getString(R.string.keyguard_unlock),
                     false /* isError */, true /* hideOnScreenOff */);
         }