Merge "Skip notifying change without visibility change" into udc-dev

2023-03-15 10:05:42 +00:00
parent b65d5dd82d 32d03f38b7
commit ecfc7bd0cb
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -5225,6 +5225,11 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
            Slog.w(TAG_WM, "Attempted to set visibility of non-existing app token: " + token);
            return;
        }
+        if (visible == mVisibleRequested && visible == mVisible
+                && mTransitionController.isShellTransitionsEnabled()) {
+            // For shell transition, it is no-op if there is no state change.
+            return;
+        }
        if (visible) {
            mDeferHidingClient = false;
        }