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

Commit 1ec9d663 authored by Chris Li's avatar Chris Li
Browse files

Cleanup alwaysDeferTransitionWhenApplyWct 

Fix: 335562144
Test: pass existing
Flag: EXEMPT flag cleanup
Change-Id: Ied0d199f832a82d15462a4e74907c13e3ec62e43
parent ab0182ca

core/java/android/window/flags/windowing_sdk.aconfig

+0 −10
Original line number Original line Diff line number Diff line
@@ -91,16 +91,6 @@ flag { 
    is_fixed_read_only: true

    is_fixed_read_only: true

}

}





flag {

    namespace: "windowing_sdk"

    name: "always_defer_transition_when_apply_wct"

    description: "Report error when defer transition fails when it should not"

    bug: "335562144"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

flag {

    namespace: "windowing_sdk"

    namespace: "windowing_sdk"

    name: "fix_pip_restore_to_overlay"

    name: "fix_pip_restore_to_overlay"

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -617,7 +617,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
            if (transition.isCollecting()) {

            if (transition.isCollecting()) {

                deferTransitionReady = true;

                deferTransitionReady = true;

                transition.deferTransitionReady();

                transition.deferTransitionReady();

            } else if (Flags.alwaysDeferTransitionWhenApplyWct()) {

            } else {

                Slog.w(TAG, "Transition is not collecting when applyTransaction."

                Slog.w(TAG, "Transition is not collecting when applyTransaction."

                        + " transition=" + transition + " state=" + transition.getState());

                        + " transition=" + transition + " state=" + transition.getState());

                transition = null;

                transition = null;