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 a305bfc7b0ab6..1219ada78b995 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -4619,8 +4619,9 @@ public class StatusBar extends SystemUI implements DemoMode, == FingerprintUnlockController.MODE_WAKE_AND_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) {