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

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

Merge "Transitions can also be aborted after start." into tm-qpr-dev am: 73fb86b1 

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



Change-Id: I1e7f4ccc37ec37dc92d558516e2e8c3a80d43c2c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02e98cc5 73fb86b1

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

+2 −2
Original line number Diff line number Diff line
@@ -879,8 +879,8 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe 
    void abort() {

        // This calls back into itself via controller.abort, so just early return here.

        if (mState == STATE_ABORT) return;

        if (mState != STATE_COLLECTING) {

            throw new IllegalStateException("Too late to abort.");

        if (mState != STATE_COLLECTING && mState != STATE_STARTED) {

            throw new IllegalStateException("Too late to abort. state=" + mState);

        }

        ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Aborting Transition: %d", mSyncId);

        mState = STATE_ABORT;