summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author bo.yan <bo.yan@unisoc.com> 2022-09-19 13:38:02 +0800
committer Hung-ying Tyan <tyanh@google.com> 2022-09-25 22:40:23 +0800
commitc582b3c20b84e75f7979e9fdca3adbd08648c12d (patch)
tree6b680a5cedc5d4f931f45a61c57afee247807c12
parent611464f7ad349cd8716dbf902675904530ca5f1c (diff)
CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail
Bug: 245466338 Test: TH Change-Id: Ia0a52477fc62b403c678301c8e49561d3b23bedf
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java3
1 files changed, 2 insertions, 1 deletions
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 0b63bbfec877..a77a6000b73b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
@@ -3368,7 +3368,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()) {
mStatusBarKeyguardViewManager.showGenericBouncer(true /* scrimmed */);
}
}