Stop depending on the ConnectivityService default request.
This avoids the need to expose ConnectivityService implementation details as @SystemApi and the complexities that would be required to make NetworkCapabilities parcelable in stable AIDL. Bug: 112869080 Test: atest FrameworksNetTests NetworkStackTests Change-Id: Icd5d25b9b8e9b7a7d1899b000c92dc4976c3b3d7
This commit is contained in:
@@ -1508,6 +1508,12 @@ public class ConnectivityServiceTest {
|
||||
verifyActiveNetwork(TRANSPORT_WIFI);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRequiresValidation() {
|
||||
assertTrue(NetworkMonitorUtils.isValidationRequired(
|
||||
mCm.getDefaultRequest().networkCapabilities));
|
||||
}
|
||||
|
||||
enum CallbackState {
|
||||
NONE,
|
||||
AVAILABLE,
|
||||
@@ -4404,8 +4410,7 @@ public class ConnectivityServiceTest {
|
||||
mMockVpn.setUids(ranges);
|
||||
// VPN networks do not satisfy the default request and are automatically validated
|
||||
// by NetworkMonitor
|
||||
assertFalse(NetworkMonitorUtils.isValidationRequired(
|
||||
mCm.getDefaultRequest().networkCapabilities, vpnNetworkAgent.mNetworkCapabilities));
|
||||
assertFalse(NetworkMonitorUtils.isValidationRequired(vpnNetworkAgent.mNetworkCapabilities));
|
||||
vpnNetworkAgent.setNetworkValid();
|
||||
|
||||
vpnNetworkAgent.connect(false);
|
||||
|
||||
Reference in New Issue
Block a user