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

Commit a4e6d185 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Play no-op-during-display-change transition immediately" into main

parents 27eb15f1 2313e180

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

+2 −1
Original line number Diff line number Diff line
@@ -3881,7 +3881,8 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
        if (!mController.useFullReadyTracking()) {

            Slog.e(TAG, "#" + mSyncId + " readiness timeout, used=" + mReadyTrackerOld.mUsed

                    + " deferReadyDepth=" + mReadyTrackerOld.mDeferReadyDepth

                    + " group=" + mReadyTrackerOld.mReadyGroups);

                    + " group=" + mReadyTrackerOld.mReadyGroups

                    + " state=" + mState);

        } else {

            Slog.e(TAG, "#" + mSyncId + " met conditions: " + mReadyTracker.mMet);

            Slog.e(TAG, "#" + mSyncId + " unmet conditions: " + mReadyTracker.mConditions);

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

+1 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,7 @@ class TransitionController { 
            // to report it as a no-op.

            ProtoLog.w(WmProtoLogGroups.WM_DEBUG_WINDOW_TRANSITIONS_MIN,

                    "Formerly queued #%d force-reported as no-op", queued.mTransition.getSyncId());

            queued.mTransition.setAllReady();

            queued.mTransition.playNow();

        } else {

            // Post this so that the now-playing transition logic isn't interrupted.

            mAtm.mH.post(() -> {