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

Commit 5be8ccc6 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix some additional tests registering real receivers" into udc-dev

parents 319c4fb9 b51fa3a7

services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ public class UiServiceTestCase { 
        Mockito.doReturn(new Intent()).when(mContext).registerReceiverAsUser(

                any(), any(), any(), any(), any());

        Mockito.doReturn(new Intent()).when(mContext).registerReceiver(any(), any());

        Mockito.doReturn(new Intent()).when(mContext).registerReceiver(any(), any(), anyInt());

        Mockito.doNothing().when(mContext).unregisterReceiver(any());

    }

services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java

+0 −2
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ public class RoleObserverTest extends UiServiceTestCase { 
    private TestableNotificationManagerService mService;

    private NotificationManagerService.RoleObserver mRoleObserver;



    private TestableContext mContext = spy(getContext());



    @Mock

    private PreferencesHelper mPreferencesHelper;

    @Mock