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

Commit 3ba79d2f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't throw, only log when collecting is not collecting" into main

parents c9f170ca 08f35152

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

+1 −4
Original line number Diff line number Diff line
@@ -3496,10 +3496,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
     */

    void collectDisplayChange(@NonNull Transition transition) {

        if (!mLastHasContent) return;

        if (!transition.isCollecting()) {

            throw new IllegalArgumentException("Can only collect display change if transition"

                    + " is collecting");

        }

        if (!transition.isCollecting()) return;

        if (!transition.mParticipants.contains(this)) {

            transition.collect(this);

            startAsyncRotationIfNeeded();

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

+4 −0
Original line number Diff line number Diff line
@@ -408,6 +408,10 @@ class TransitionController { 
     */

    @Nullable

    Transition getCollectingTransition() {

        if (mCollectingTransition != null && !mCollectingTransition.isCollecting()) {

            Slog.wtfStack(TAG, "Collecting Transition (#" + mCollectingTransition.getSyncId()

                    + ") is not collecting. state=" + mCollectingTransition.getState());

        }

        return mCollectingTransition;

    }