Merge "Replace requestNetwork with registerSystemDefaultNetworkCallback"
This commit is contained in:
@@ -1434,7 +1434,7 @@ public class VpnTest extends VpnTestBase {
|
|||||||
final ArgumentCaptor<NetworkCallback> networkCallbackCaptor =
|
final ArgumentCaptor<NetworkCallback> networkCallbackCaptor =
|
||||||
ArgumentCaptor.forClass(NetworkCallback.class);
|
ArgumentCaptor.forClass(NetworkCallback.class);
|
||||||
verify(mConnectivityManager, timeout(TEST_TIMEOUT_MS))
|
verify(mConnectivityManager, timeout(TEST_TIMEOUT_MS))
|
||||||
.requestNetwork(any(), networkCallbackCaptor.capture());
|
.registerSystemDefaultNetworkCallback(networkCallbackCaptor.capture(), any());
|
||||||
|
|
||||||
// onAvailable() will trigger onDefaultNetworkChanged(), so NetdUtils#setInterfaceUp will be
|
// onAvailable() will trigger onDefaultNetworkChanged(), so NetdUtils#setInterfaceUp will be
|
||||||
// invoked. Set the return value of INetd#interfaceGetCfg to prevent NullPointerException.
|
// invoked. Set the return value of INetd#interfaceGetCfg to prevent NullPointerException.
|
||||||
|
|||||||
Reference in New Issue
Block a user