commit 2ff9d230252f684de450997d63baa003af879bf1
author Sunny Goyal <sunnygoyal@google.com> Thu Jan 12 11:41:29 2023 -0800
committer Chavi Weingarten <chaviw@google.com> Thu Jan 12 20:09:19 2023 +0000
tree c6242c7570161523c14c0584ca7b109e68e00ae3
parent 0da4f48c2a1101e32cf836c5aff1af1c6eaef90b

Unblocking surface sync if the viewroot dies before traversal can happen

Bug: 260135164
Test: Verified the code flow as the cause of bug
Change-Id: Ie168b7cb772f6ec89063a42a7b15e7d5342f5bd3

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 2114ce7..74e521a 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -8823,6 +8823,10 @@
             mAdded = false;
             AnimationHandler.removeRequestor(this);
         }
+        if (mActiveSurfaceSyncGroup != null) {
+            mActiveSurfaceSyncGroup.markSyncReady();
+            mActiveSurfaceSyncGroup = null;
+        }
         WindowManagerGlobal.getInstance().doRemoveView(this);
     }