summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Arthur (Min-Hsin) Lee <leearthur@google.com> 2023-12-21 05:31:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-21 05:31:43 +0000
commit41fab305429e461d30d0b378abfd1f5c34fba76b (patch)
treee9e4511313a8b69b6cff8de5f126b2e2b67f4fc9
parent2656410695f0309034b94b29cea96b7618db443b (diff)
parent700154e915ced9c6cc9ce85a3aca2fafe24a1286 (diff)
Merge "Skip sync invisible & lifecycle-unlreated window for an Activity." into udc-dev am: 051bf934b8 am: 700154e915
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25511825 Change-Id: I66c3017ab9ddee1d501774875c449d80a54af660 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 d283df259bfc..b3c11012b91b 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -5686,6 +5686,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