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

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

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

Change-Id: I5284f18739be8930c88a4f189e81b8ec46f6d321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2023-04-06 19:23:32 +00:00
committed by Automerger Merge Worker
parent acf40537cc 5be8ccc63b
commit a7e2d06dbc
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/tests/uiservicestests/src/com/android/server/UiServiceTestCase.java
View File

@@ -87,6 +87,7 @@ public class UiServiceTestCase {
Mockito.doReturn(new Intent()).when(mContext).registerReceiverAsUser( Mockito.doReturn(new Intent()).when(mContext).registerReceiverAsUser(
any(), any(), any(), any(), any()); any(), any(), any(), any(), any());
Mockito.doReturn(new Intent()).when(mContext).registerReceiver(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()); Mockito.doNothing().when(mContext).unregisterReceiver(any());
} }

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

@@ -96,8 +96,6 @@ public class RoleObserverTest extends UiServiceTestCase {
private TestableNotificationManagerService mService; private TestableNotificationManagerService mService;
private NotificationManagerService.RoleObserver mRoleObserver; private NotificationManagerService.RoleObserver mRoleObserver;
private TestableContext mContext = spy(getContext());
@Mock @Mock
private PreferencesHelper mPreferencesHelper; private PreferencesHelper mPreferencesHelper;
@Mock @Mock