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

Commit 88f99f05 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "CtsWindowManagerDeviceTestCases... 

Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail" into tm-qpr-dev-plus-aosp
parents 79a0ec19 c582b3c2

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

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

            }

        }