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

Commit c9626f21 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Apply display change for non-started transition" into main

parents 0ed9e0d9 3d9e35cc

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

+8 −3
Original line number Diff line number Diff line
@@ -3519,11 +3519,16 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            Slog.e(TAG, "#" + mSyncId + " readiness timeout, used=" + mReadyTrackerOld.mUsed

                    + " deferReadyDepth=" + mReadyTrackerOld.mDeferReadyDepth

                    + " group=" + mReadyTrackerOld.mReadyGroups);

            return;

        }

        } else {

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

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

        }

        // Make sure the pending display change can be applied (especially DC#mWaitingForConfig)

        // in case shell hasn't called WindowOrganizerController#startTransition yet.

        if (mState < STATE_STARTED && this == mController.getCollectingTransition()) {

            applyDisplayChangeIfNeeded(new ArraySet<>());

        }

    }



    /**

     * Represents a condition that must be met before an associated transition can be considered