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

Commit 386e0738 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "CtsWindowManagerDeviceTestCases... 

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

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 */);

            }

        }