Merge "Don't wait for windows which are goneForLayout"

2020-09-16 01:39:42 +00:00
parent 28a10589ef b1574e7aa9
commit 1529f0ddf4
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -5863,6 +5863,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
    @Override
    boolean prepareForSync(BLASTSyncEngine.TransactionReadyListener waitingListener,
            int waitingId) {
+        // If the window is goneForLayout, relayout won't be called so we'd just wait forever.
+        if (isGoneForLayout()) {
+            return false;
+        }
        boolean willSync = setPendingListener(waitingListener, waitingId);
        if (!willSync) {
            return false;