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

Commit 4faf9b25 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix failing testOnPictureInPictureRequested" into rvc-dev am:... 

Merge "Fix failing testOnPictureInPictureRequested" into rvc-dev am: bcb2d73e am: 6f77d48b am: 309d7c2c

Change-Id: I6e0a5a45a1262708af8e3fe8ed1dd63f935e02f1
parents 2e8a14d7 309d7c2c

services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -89,13 +89,13 @@ public class ActivityTaskManagerServiceTests extends ActivityTestsBase { 
    public void testOnPictureInPictureRequested() throws RemoteException {

    public void testOnPictureInPictureRequested() throws RemoteException {

        final ActivityStack stack = new StackBuilder(mRootWindowContainer).build();

        final ActivityStack stack = new StackBuilder(mRootWindowContainer).build();

        final ActivityRecord activity = stack.getBottomMostTask().getTopNonFinishingActivity();

        final ActivityRecord activity = stack.getBottomMostTask().getTopNonFinishingActivity();

        ClientLifecycleManager lifecycleManager = mService.getLifecycleManager();

        final ClientLifecycleManager mockLifecycleManager = mock(ClientLifecycleManager.class);

        doNothing().when(lifecycleManager).scheduleTransaction(any());

        doReturn(mockLifecycleManager).when(mService).getLifecycleManager();

        doReturn(true).when(activity).checkEnterPictureInPictureState(anyString(), anyBoolean());

        doReturn(true).when(activity).checkEnterPictureInPictureState(anyString(), anyBoolean());





        mService.requestPictureInPictureMode(activity.token);

        mService.requestPictureInPictureMode(activity.token);





        verify(lifecycleManager).scheduleTransaction(mClientTransactionCaptor.capture());

        verify(mockLifecycleManager).scheduleTransaction(mClientTransactionCaptor.capture());

        final ClientTransaction transaction = mClientTransactionCaptor.getValue();

        final ClientTransaction transaction = mClientTransactionCaptor.getValue();

        // Check that only an enter pip request item callback was scheduled.

        // Check that only an enter pip request item callback was scheduled.

        assertEquals(1, transaction.getCallbacks().size());

        assertEquals(1, transaction.getCallbacks().size());