Merge "Unblocking surface sync if the viewroot dies before traversal can happen"

2023-01-13 14:09:21 +00:00
parent c0252daa22 2ff9d23025
commit 2bd5e20280
1 changed files with 4 additions and 0 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -8823,6 +8823,10 @@ public final class ViewRootImpl implements ViewParent,
            mAdded = false;
            AnimationHandler.removeRequestor(this);
        }
+        if (mActiveSurfaceSyncGroup != null) {
+            mActiveSurfaceSyncGroup.markSyncReady();
+            mActiveSurfaceSyncGroup = null;
+        }
        WindowManagerGlobal.getInstance().doRemoveView(this);
    }