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

Commit a7e2d06d authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Fix some additional tests registering real receivers" into udc-dev am: 5be8ccc6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22500539



Change-Id: I5284f18739be8930c88a4f189e81b8ec46f6d321
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents acf40537 5be8ccc6

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