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

Commit 10a6a70e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Catch Exception to avoid SyncCallback residue" into main am: df8b3d75 

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



Change-Id: Ibd1238c61b9f199d64c3511cf546a329b903901b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 358aa5a7 df8b3d75

libs/WindowManager/Shell/src/com/android/wm/shell/common/SyncTransactionQueue.java

+13 −6
Original line number Diff line number Diff line
@@ -192,15 +192,22 @@ public final class SyncTransactionQueue { 
                throw new IllegalStateException("Sync Transactions must be serialized. In Flight: "

                        + mInFlight.mId + " - " + mInFlight.mWCT);

            }

            mInFlight = this;

            if (DEBUG) Slog.d(TAG, "Sending sync transaction: " + mWCT);

            try {

                if (mLegacyTransition != null) {

                    mId = new WindowOrganizer().startLegacyTransition(mLegacyTransition.getType(),

                            mLegacyTransition.getAdapter(), this, mWCT);

                } else {

                    mId = new WindowOrganizer().applySyncTransaction(mWCT, this);

                }

            } catch (RuntimeException e) {

                Slog.e(TAG, "Send failed", e);

                // Finish current sync callback immediately.

                onTransactionReady(mId, new SurfaceControl.Transaction());

                return;

            }

            if (DEBUG) Slog.d(TAG, " Sent sync transaction. Got id=" + mId);

            mInFlight = this;

            mMainExecutor.executeDelayed(mOnReplyTimeout, REPLY_TIMEOUT);

        }