summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Arthur (Min-Hsin) Lee <leearthur@google.com> 2023-12-21 06:06:32 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-21 06:06:32 +0000
commit577824d005809aa78d178f67b19d097133881263 (patch)
treef146be9ea412ed4964f7245e794bd1328e2ad79e
parent1aa8606b394c96ed408bb8fffb04fd4ab2525e14 (diff)
parent41fab305429e461d30d0b378abfd1f5c34fba76b (diff)
Merge "Skip sync invisible & lifecycle-unlreated window for an Activity." into udc-dev am: 051bf934b8 am: 700154e915 am: 41fab30542
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25511825 Change-Id: Ibfbcf6c1891e93ddb6386c335534c6aa34b162b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/wm/WindowState.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index bb49e0b4a94f..562ed13fad8e 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -5688,6 +5688,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
// Skip sync for invisible app windows which are not managed by activity lifecycle.
return false;
}
+ if (mActivityRecord != null && mViewVisibility != View.VISIBLE
+ && mWinAnimator.mAttrType != TYPE_BASE_APPLICATION
+ && mWinAnimator.mAttrType != TYPE_APPLICATION_STARTING) {
+ // Skip sync for invisible app windows which are not managed by activity lifecycle.
+ return false;
+ }
// In the WindowContainer implementation we immediately mark ready
// since a generic WindowContainer only needs to wait for its
// children to finish and is immediately ready from its own