Merge "Mock out one more overload of Context#registerReceiver()" into main
diff --git a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
index 17d9ef9..f83144f 100644
--- a/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
+++ b/services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
@@ -35,12 +35,15 @@
import static org.mockito.Mockito.when;
import android.app.ActivityManagerInternal;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.IntentFilter;
import android.content.pm.PackageManagerInternal;
import android.content.res.Configuration;
import android.hardware.input.IInputManager;
import android.hardware.input.InputManagerGlobal;
import android.os.Binder;
+import android.os.Handler;
import android.os.IBinder;
import android.os.Process;
import android.os.RemoteException;
@@ -182,6 +185,9 @@
doNothing().when(mContext).enforceCallingPermission(anyString(), anyString());
doNothing().when(mContext).sendBroadcastAsUser(any(), any());
doReturn(null).when(mContext).registerReceiver(any(), any());
+ doReturn(null).when(mContext).registerReceiver(
+ any(BroadcastReceiver.class),
+ any(IntentFilter.class), anyString(), any(Handler.class));
doReturn(null)
.when(mContext)
.registerReceiverAsUser(any(), any(), any(), anyString(), any(), anyInt());