From fe12d0f842d8d54c7c0b89748f54ccab33c7b592 Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Wed, 31 Mar 2021 22:05:52 +0800
Subject: [PATCH] Set wallpaper to invisible only if it is not
 visible-requested

After transition animation is done, the wallpaper may be still
visible, then it is unnecessary to always commit as invisible.

Bug: 183165393
Test: Swipe from landscape app to portrait home
Change-Id: I20936aa51d210f49824987936ca65d4cdc97e33f
---
 .../core/java/com/android/server/wm/WallpaperController.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java
index 7644cf2fa5920..580bd06194c86 100644
--- a/services/core/java/com/android/server/wm/WallpaperController.java
+++ b/services/core/java/com/android/server/wm/WallpaperController.java
@@ -274,7 +274,9 @@ class WallpaperController {
     void hideDeferredWallpapersIfNeededLegacy() {
         for (int i = mWallpaperTokens.size() - 1; i >= 0; i--) {
             final WallpaperWindowToken token = mWallpaperTokens.get(i);
-            token.commitVisibility(false);
+            if (!token.isVisibleRequested()) {
+                token.commitVisibility(false);
+            }
         }
     }