Merge "Hold lock when start pending transaction"

2022-02-10 01:18:51 +00:00
parent a9a0b5b7c9 b76564ede7
commit 4b09797323
1 changed files with 5 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowOrganizerController.java
+++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java
@@ -1146,7 +1146,11 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
        final PendingTransaction pt = mPendingTransactions.remove(0);
        pt.startSync();
        // Post this so that the now-playing transition setup isn't interrupted.
-        mService.mH.post(pt::startTransaction);
+        mService.mH.post(() -> {
+            synchronized (mGlobalLock) {
+                pt.startTransaction();
+            }
+        });
    }

    @Override