From cdfce8c8f19908e8ecded200f0120819fbb20630 Mon Sep 17 00:00:00 2001
From: "bo.yan" <bo.yan@unisoc.com>
Date: Mon, 19 Sep 2022 13:38:02 +0800
Subject: [PATCH] CtsWindowManagerDeviceTestCases
 android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground
 --fail

Change-Id: Ia0a52477fc62b403c678301c8e49561d3b23bedf
Merged-In: Ia0a52477fc62b403c678301c8e49561d3b23bedf
---
 .../android/systemui/statusbar/phone/CentralSurfacesImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
index 7e57dd452cb8c..296653861bc63 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -3384,7 +3384,8 @@ public class CentralSurfacesImpl extends CoreStartable implements
                 // lock screen where users can use the UDFPS affordance to enter the device
                 mStatusBarKeyguardViewManager.reset(true);
             } else if ((mState == StatusBarState.KEYGUARD
-                    && !mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing())
+                    && !mStatusBarKeyguardViewManager.bouncerIsOrWillBeShowing()
+                    && isKeyguardSecure())
                     || mState == StatusBarState.SHADE_LOCKED) {
                 mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */);
             }