commit 54526e9b29556ede6c22a07fad83cc6cc8163915
author John Reck <jreck@google.com> Fri May 03 13:38:12 2024 -0400
committer John Reck <jreck@google.com> Mon May 06 10:26:49 2024 -0400
tree dc145a5e7addd41aaed8e9230caf182f18898cb3
parent 73a196df8cf2ba339566b24ee4a94dd5c15e0031

Apply pending transactions always

Test: repro in bug
Bug: 334901521

Change-Id: I8f856e7be5917a1d01f0ee2bdbe613bf37045646

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 2cb862c..8f5c85f 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -4229,7 +4229,14 @@
             mReportNextDraw = false;
             mLastReportNextDrawReason = null;
             mActiveSurfaceSyncGroup = null;
-            mHasPendingTransactions = false;
+            if (mHasPendingTransactions) {
+                // TODO: We shouldn't ever actually hit this, it means mPendingTransaction wasn't
+                // merged with a sync group or BLASTBufferQueue before making it to this point
+                // But better a one or two frame flicker than steady-state broken from dropping
+                // whatever is in this transaction
+                mPendingTransaction.apply();
+                mHasPendingTransactions = false;
+            }
             mSyncBuffer = false;
             if (isInWMSRequestedSync()) {
                 mWmsRequestSyncGroup.markSyncReady();