From 2d473d5394cccfd4767f143e04d015f70ddd8d6e Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Sun, 29 Jan 2023 11:46:38 +0000
Subject: [PATCH] Restore accidental deletion of a return statement

To avoid setClientVisible() of wallpaper window from being called
too early before transition is finished.

Bug: 260059642
Test: WallpaperControllerTests
Change-Id: Ibc94ffb64897e39424ef1c8d85ad5f4a6f4960ad
---
 .../java/com/android/server/wm/WallpaperWindowToken.java     | 5 ++++-
 1 file changed, 4 insertions(+), 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 210d5a5f480f2..6b2bf599d5ea5 100644
--- a/services/core/java/com/android/server/wm/WallpaperWindowToken.java
+++ b/services/core/java/com/android/server/wm/WallpaperWindowToken.java
@@ -99,7 +99,6 @@ class WallpaperWindowToken extends WindowToken {
         }
     }
 
-    /** Returns {@code true} if visibility is changed. */
     void updateWallpaperWindows(boolean visible) {
         boolean changed = false;
         if (mVisibleRequested != visible) {
@@ -117,6 +116,10 @@ class WallpaperWindowToken extends WindowToken {
                     linkFixedRotationTransform(wallpaperTarget.mToken);
                 }
             }
+            // If wallpaper is in transition, setVisible() will be called from commitVisibility()
+            // when finishing transition. Otherwise commitVisibility() is already called from above
+            // setVisibility().
+            return;
         }
 
         final WindowState wallpaperTarget =