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

Commit 08f35152 authored by Evan Rosky's avatar Evan Rosky
Browse files

Don't throw, only log when collecting is not collecting 

There's apparently a super rare situation where the
controller's mCollecting transition is somehow not in
collecting mode. Remove this exception and instead add
some logging in getCollectingTransition() to hopefully
detect earlier when this mismatch might occur.

Bug: 355384206
Flag: EXEMPT bugfix
Test: N/A
Change-Id: Icc8a09e37b6da8b54efcffef51ed96a000c562cc
parent 4fa24d0b

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

+5 −1
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ import android.window.WindowContainerTransaction; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.ProtoLogGroup;

import com.android.internal.protolog.ProtoLog;

import com.android.internal.protolog.ProtoLogGroup;

import com.android.server.FgThread;

import com.android.window.flags.Flags;
@@ -409,6 +409,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;

    }