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

Commit 33d8327c authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Always update the PictureInPictureParams" into main

parents b2858a5e b2b59d1f

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTaskListener.java

+3 −2
Original line number Diff line number Diff line
@@ -111,8 +111,9 @@ public class PipTaskListener implements ShellTaskOrganizer.TaskListener, 
                listener.onActionsChanged(params.getActions(), params.getCloseAction());

            }

        }

        mPictureInPictureParams.copyOnlySet(params != null ? params

                : new PictureInPictureParams.Builder().build());

        // Set the new params but make sure mPictureInPictureParams is not null.

        mPictureInPictureParams = params == null

                ? new PictureInPictureParams.Builder().build() : params;

    }



    /** Add a PipParamsChangedCallback listener. */

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip2/phone/PipTaskListenerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ public class PipTaskListenerTest { 
        verifyNoMoreInteractions(mMockPipParamsChangedCallback);

        verify(mMockPipTransitionState, times(0))

                .setOnIdlePipTransitionStateRunnable(any(Runnable.class));

        assertTrue(mPipTaskListener.getPictureInPictureParams().empty());

    }



    @Test