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

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

Merge "Use isSplitActive vs visible when detecting mixed pip/split" into udc-dev

parents 57340dfc 6c3d9ca3

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler, 
    @Override

    public WindowContainerTransaction handleRequest(@NonNull IBinder transition,

            @NonNull TransitionRequestInfo request) {

        if (mPipHandler.requestHasPipEnter(request) && mSplitHandler.isSplitScreenVisible()) {

        if (mPipHandler.requestHasPipEnter(request) && mSplitHandler.isSplitActive()) {

            ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " Got a PiP-enter request while "

                    + "Split-Screen is foreground, so treat it as Mixed.");

                    + "Split-Screen is active, so treat it as Mixed.");

            if (request.getRemoteTransition() != null) {

                throw new IllegalStateException("Unexpected remote transition in"

                        + "pip-enter-from-split request");