Merge "Fix a race condition in DeviceIdleControllerTest."

This commit is contained in:
TreeHugger Robot
2018-12-17 21:28:26 +00:00
committed by Android (Google) Code Review

View File

@@ -203,6 +203,8 @@ public class DeviceIdleControllerTest {
.strictness(Strictness.LENIENT)
.mockStatic(LocalServices.class)
.startMocking();
spyOn(getContext());
doReturn(null).when(getContext()).registerReceiver(any(), any());
doReturn(mock(ActivityManagerInternal.class))
.when(() -> LocalServices.getService(ActivityManagerInternal.class));
doReturn(mock(ActivityTaskManagerInternal.class))