LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Stop depending on the ConnectivityService default request." am: bb5952107d am: 0b27bd5aeb

Browse Source 
am: dd1c03b05c

Change-Id: Ia3730d55442da165b779242a35c7c66bd0d9b8fe
This commit is contained in:
Lorenzo Colitti
2019-01-23 08:36:21 -08:00
committed by android-build-merger
parent 45c9f33845 dd1c03b05c
commit 4fd5a42479
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) { private boolean networkRequiresValidation(NetworkAgentInfo nai) {
return isValidationRequired( return isValidationRequired(nai.networkCapabilities);
mDefaultRequest.networkCapabilities, nai.networkCapabilities);
} }
private void handleFreshlyValidatedNetwork(NetworkAgentInfo nai) { 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); verifyActiveNetwork(TRANSPORT_WIFI);
} }
@Test
public void testRequiresValidation() {
assertTrue(NetworkMonitorUtils.isValidationRequired(
mCm.getDefaultRequest().networkCapabilities));
}
enum CallbackState { enum CallbackState {
NONE, NONE,
AVAILABLE, AVAILABLE,
@@ -4404,8 +4410,7 @@ public class ConnectivityServiceTest {
mMockVpn.setUids(ranges); mMockVpn.setUids(ranges);
// VPN networks do not satisfy the default request and are automatically validated // VPN networks do not satisfy the default request and are automatically validated
// by NetworkMonitor // by NetworkMonitor
assertFalse(NetworkMonitorUtils.isValidationRequired( assertFalse(NetworkMonitorUtils.isValidationRequired(vpnNetworkAgent.mNetworkCapabilities));
mCm.getDefaultRequest().networkCapabilities, vpnNetworkAgent.mNetworkCapabilities));
vpnNetworkAgent.setNetworkValid(); vpnNetworkAgent.setNetworkValid();
vpnNetworkAgent.connect(false); vpnNetworkAgent.connect(false);