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

Commit d0790027 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "CtsWindowManagerDeviceTestCases... 

Merge "CtsWindowManagerDeviceTestCases android.server.wm.KeyguardTests#testResumeDismissKeyguardActivityFromBackground --fail"
parents 6ffa5fcc cdfce8c8

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

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

            }