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

Commit 95b568d0 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Use isSplitActive vs visible when detecting mixed pip/split" into... 

Merge "Use isSplitActive vs visible when detecting mixed pip/split" into udc-dev am: aeac802e am: 989d47ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22999843



Change-Id: I5c381f3903bbf5c0a8bb1d594f5185348ebdef85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e345c369 989d47ed

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");