diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 5c7752401b83a..e4f142a992e93 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -4624,8 +4624,9 @@ public class StatusBar extends SystemUI implements DemoMode, != FingerprintUnlockController.MODE_UNLOCK); if (mBouncerShowing) { - mScrimController.transitionTo( - mIsOccluded ? ScrimState.BOUNCER_OCCLUDED : ScrimState.BOUNCER); + final boolean qsExpanded = mQSPanel != null && mQSPanel.isExpanded(); + mScrimController.transitionTo(mIsOccluded || qsExpanded ? + ScrimState.BOUNCER_OCCLUDED : ScrimState.BOUNCER); } else if (mLaunchCameraOnScreenTurningOn || isInLaunchTransition()) { mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback); } else if (mBrightnessMirrorVisible) {