From ffd7206b188ee5685b965781227b46485386abbc Mon Sep 17 00:00:00 2001 From: Josh Tsuji Date: Mon, 11 Apr 2022 13:16:03 -0400 Subject: [PATCH] Only set FLAG_SHOW_WALLPAPER if we're currently animating unlocked. Fixes: 226673097 Test: swipe to unlock, fast-swipe to unlock, UDFPS unlock, bouncer unlock, note wallpaper is visible when it should be Change-Id: I609d78e981376f44f36bb033527161c631b04f2f --- .../statusbar/phone/NotificationShadeWindowControllerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java index 56c74bf98e6b3..24660b261c519 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java @@ -288,7 +288,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW final boolean keyguardOrAod = state.mKeyguardShowing || (state.mDozing && mDozeParameters.getAlwaysOn()); if ((keyguardOrAod && !state.mBackdropShowing && !state.mLightRevealScrimOpaque) - || mKeyguardViewMediator.isAnimatingBetweenKeyguardAndSurfaceBehindOrWillBe()) { + || mKeyguardViewMediator.isAnimatingBetweenKeyguardAndSurfaceBehind()) { // Show the wallpaper if we're on keyguard/AOD and the wallpaper is not occluded by a // solid backdrop. Also, show it if we are currently animating between the // keyguard and the surface behind the keyguard - we want to use the wallpaper as a