Merge "Remove usage of setDefaultImpl in test"
diff --git a/tests/unit/src/com/android/server/NetworkStackServiceTest.kt b/tests/unit/src/com/android/server/NetworkStackServiceTest.kt
index cf65cd7..40abe9e 100644
--- a/tests/unit/src/com/android/server/NetworkStackServiceTest.kt
+++ b/tests/unit/src/com/android/server/NetworkStackServiceTest.kt
@@ -29,6 +29,7 @@
import android.net.dhcp.IDhcpServerCallbacks
import android.net.ip.IIpClientCallbacks
import android.net.ip.IpClient
+import android.os.Binder
import android.os.Build
import android.os.IBinder
import android.os.Process
@@ -48,6 +49,7 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.ArgumentMatchers.any
+import org.mockito.ArgumentMatchers.anyInt
import org.mockito.Mockito.doReturn
import org.mockito.Mockito.eq
import org.mockito.Mockito.mock
@@ -170,11 +172,14 @@
// Call makeNetworkMonitor
// Use a spy of INetworkMonitorCallbacks and not a mock, as mockito can't create a mock on Q
// because of the missing CaptivePortalData class that is an argument of one of the methods
- val mockNetworkMonitorCb = spy(INetworkMonitorCallbacks.Stub.asInterface(
- mock(IBinder::class.java)))
+ val mockBinder = mock(IBinder::class.java)
+ val mockNetworkMonitorCb = spy(INetworkMonitorCallbacks.Stub.asInterface(mockBinder))
doReturn(9990003).`when`(mockNetworkMonitorCb).interfaceVersion
doReturn("networkmonitor_hash").`when`(mockNetworkMonitorCb).interfaceHash
- INetworkMonitorCallbacks.Stub.setDefaultImpl(INetworkMonitorCallbacks.Default())
+ // Oneway transactions are always successful (return true). INetworkMonitorCallbacks is a
+ // oneway interface. This avoids the stub throwing because the method is not implemented by
+ // the (mock) remote.
+ doReturn(true).`when`(mockBinder).transact(anyInt(), any(), any(), eq(Binder.FLAG_ONEWAY))
connector.makeNetworkMonitor(Network(123), "test_nm", mockNetworkMonitorCb)
