From e6cb8689ee7192732cd5c10692b9e419ba11623a Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Thu, 20 Jan 2022 19:23:17 +0000
Subject: [PATCH] Don't show requested UDFPS when kg isn't showing

An activity can continue to request udfps even though
it's not necessary anymore. Make sure we don't show the
affordance in this case.

Test: manually fail udfps 2+ on gpay wallet activity
and then use the bouncer to authenticate
Fixes: 215558148

Change-Id: Ic316a57184b54d272e93e5a9efe1f6331b132787
---
 .../systemui/biometrics/UdfpsKeyguardViewController.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
index 8b7aa093600c5..3ece3ccf38faa 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardViewController.java
@@ -224,7 +224,8 @@ public class UdfpsKeyguardViewController extends UdfpsAnimationViewController<Ud
 
         if (mUdfpsRequested && !getNotificationShadeVisible()
                 && (!mIsBouncerVisible
-                || mInputBouncerHiddenAmount != KeyguardBouncer.EXPANSION_VISIBLE)) {
+                || mInputBouncerHiddenAmount != KeyguardBouncer.EXPANSION_VISIBLE)
+                && mKeyguardStateController.isShowing()) {
             return false;
         }