| commit | 7bac5dea4b3a9f07782363855c5f7111265a95f8 | [log] [tgz] |
|---|---|---|
| author | Evan Rosky <erosky@google.com> | Mon May 15 17:16:58 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 15 17:16:58 2023 +0000 |
| tree | 0affe2e6da53c8afc87fc911216c2e128eb5a5f6 | |
| parent | 80c72495332b2f193e619934718eebe9524a62e4 [diff] | |
| parent | 2f1dc4bd065ba7b48209679f46418efa7d2cff25 [diff] |
Merge "Create new SurfaceControl.Transaction when old closed" into udc-dev am: 2f1dc4bd06 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23148679 Change-Id: I6a1b45afd38abfc6f701b2f5b986c061cd64a82d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java index 778951a..98ee98b 100644 --- a/services/core/java/com/android/server/wm/BLASTSyncEngine.java +++ b/services/core/java/com/android/server/wm/BLASTSyncEngine.java
@@ -248,7 +248,10 @@ Slog.e(TAG, "WM sent Transaction to organized, but never received" + " commit callback. Application ANR likely to follow."); Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER); - onCommitted(merged); + synchronized (mWm.mGlobalLock) { + onCommitted(merged.mNativeObject != 0 + ? merged : mWm.mTransactionFactory.get()); + } } }; CommitCallback callback = new CommitCallback();