Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9956a50 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Create new SurfaceControl.Transaction when old closed" into udc-dev am:... 

Merge "Create new SurfaceControl.Transaction when old closed" into udc-dev am: 2f1dc4bd am: 56d2ee4c am: f4382281

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23148679



Change-Id: I2657014ca7a7eb3abae5f8452a3f43cc0623a128
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 625e7616 f4382281

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

+4 −1
Original line number Diff line number Diff line
@@ -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();