From 5cd5b5f2ba2b49b6d60995eb2ce82bd3a639bca2 Mon Sep 17 00:00:00 2001 From: Marzia Favaro Date: Wed, 9 Aug 2023 11:01:47 +0000 Subject: [PATCH] Call setVisibile immediately when wallpaper not in transition This was causing issues when `updateWallpaperTokens` was called by `adjustWallpaperWindows`, in particular when locking and unlocking the device, as the visibilities were not committed and the home wallpaper was visible on the lockscreen Fix: 293142437 Test: Manual: `for i in {1..50}; do adb shell wm dismiss-keyguard; sleep 0.5; adb shell input keyevent KEYCODE_POWER; sleep 1; adb shell input keyevent KEYCODE_POWER; done` Change-Id: Ibe291f57da589f109427f99bb712064376ba5b73 --- .../core/java/com/android/server/wm/WallpaperWindowToken.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WallpaperWindowToken.java b/services/core/java/com/android/server/wm/WallpaperWindowToken.java index 5ea8f65b759c7..8e0ad0d01cfef 100644 --- a/services/core/java/com/android/server/wm/WallpaperWindowToken.java +++ b/services/core/java/com/android/server/wm/WallpaperWindowToken.java @@ -170,7 +170,7 @@ class WallpaperWindowToken extends WindowToken { linkFixedRotationTransform(wallpaperTarget.mToken); } } - if (mTransitionController.isShellTransitionsEnabled()) { + if (mTransitionController.inTransition(this)) { // If wallpaper is in transition, setVisible() will be called from commitVisibility() // when finishing transition. Otherwise commitVisibility() is already called from above // setVisibility().