joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Stop depending on the ConnectivityService default request."

Browse source
This commit is contained in:
Lorenzo Colitti 2019-01-23 12:29:40 +00:00 • committed by Gerrit Code Review
commit bb5952107d
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
services/core/java/com/android/server/ConnectivityService.java
View file

@ -2640,8 +2640,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
private boolean networkRequiresValidation(NetworkAgentInfo nai) {
return isValidationRequired(
mDefaultRequest.networkCapabilities, nai.networkCapabilities);
return isValidationRequired(nai.networkCapabilities);
}
private void handleFreshlyValidatedNetwork(NetworkAgentInfo nai) {

9
tests/net/java/com/android/server/ConnectivityServiceTest.java
View file

@ -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);