Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cfef1d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CtsWindowManagerDeviceTestCases... 

Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" into tm-qpr-dev-plus-aosp am: 88f99f05

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20027272



Change-Id: I4e8f206e5722b7078f245643f87e9e6c3615a9f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6e74062 88f99f05

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -3348,7 +3348,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 */);

            }

        }