Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Iac2f4f69dad30407c5e1de91d221bed3f922b153
This commit is contained in:
TreeHugger Robot
2020-04-15 23:48:50 +00:00
committed by Automerger Merge Worker
parent b4e7cbb85c bcb2d73e48
commit 6f77d48bd4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());