diff --git a/services/core/java/com/android/server/wm/BLASTSyncEngine.java b/services/core/java/com/android/server/wm/BLASTSyncEngine.java index 778951a545fa7..98ee98ba67f74 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 @@ class BLASTSyncEngine { 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();