commit 3ebe33401925a9e74e851c394b8af5ebda052d47
author Vishnu Nair <vishnun@google.com> Fri Jan 24 05:37:23 2025 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Feb 18 17:48:21 2025 -0800
tree cd246e12d884b1c73b228c85316eaa78ff8c8746
parent a319e9fd2bc69d590a85e86f60e306b16d2c5097

Update ActivityRecordInputSink using the pending transaction

In some cases where finishTransition happens before the pending
transaction is applied, we can end up with a stale state. Subsequent
prepareSurfaces does not fix the issue because the InputWindowHandle is
only applied on changes.

Fix the race by only using pending transactions to apply
ActivityRecordInputSink state changes.

Bug: 332277530
Test: POC from bug
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7366b99644fa61279591eec54ea725d86d6e2e93)
Merged-In: If93840ad7b2abbcb48c0c332870c48046c0f8fdc
Change-Id: If93840ad7b2abbcb48c0c332870c48046c0f8fdc

services/core/java/com/android/server/wm/Transition.java

diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 1fc609b7..3e7fbf4 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -1497,16 +1497,15 @@
         }
 
         // Update the input-sink (touch-blocking) state now that the animation is finished.
-        SurfaceControl.Transaction inputSinkTransaction = null;
+        boolean scheduleAnimation = false;
         for (int i = 0; i < mParticipants.size(); ++i) {
             final ActivityRecord ar = mParticipants.valueAt(i).asActivityRecord();
             if (ar == null || !ar.isVisible() || ar.getParent() == null) continue;
-            if (inputSinkTransaction == null) {
-                inputSinkTransaction = ar.mWmService.mTransactionFactory.get();
-            }
-            ar.mActivityRecordInputSink.applyChangesToSurfaceIfChanged(inputSinkTransaction);
+            scheduleAnimation = true;
+            ar.mActivityRecordInputSink.applyChangesToSurfaceIfChanged(ar.getPendingTransaction());
         }
-        if (inputSinkTransaction != null) inputSinkTransaction.apply();
+        // To apply pending transactions.
+        if (scheduleAnimation) mController.mAtm.mWindowManager.scheduleAnimationLocked();
 
         // Always schedule stop processing when transition finishes because activities don't
         // stop while they are in a transition thus their stop could still be pending.