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

Merge "Add excludeLocalRoutes in NativeNetworkConfig" am: e52be3b59f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944725

Change-Id: I21f27620f3d41ef00862063ae0a349a815e09f2e
This commit is contained in:
Chiachang Wang
2022-01-13 01:15:47 +00:00
committed by Automerger Merge Worker
parent f21f17a142 e52be3b59f
commit 6571c82556
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/com/android/server/ConnectivityService.java
View File

@@ -4041,11 +4041,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
config = new NativeNetworkConfig(nai.network.getNetId(), NativeNetworkType.VIRTUAL, config = new NativeNetworkConfig(nai.network.getNetId(), NativeNetworkType.VIRTUAL,
INetd.PERMISSION_NONE, INetd.PERMISSION_NONE,
(nai.networkAgentConfig == null || !nai.networkAgentConfig.allowBypass), (nai.networkAgentConfig == null || !nai.networkAgentConfig.allowBypass),
getVpnType(nai)); getVpnType(nai), /*excludeLocalRoutes=*/ false);
} else { } else {
config = new NativeNetworkConfig(nai.network.getNetId(), NativeNetworkType.PHYSICAL, config = new NativeNetworkConfig(nai.network.getNetId(), NativeNetworkType.PHYSICAL,
getNetworkPermission(nai.networkCapabilities), /*secure=*/ false, getNetworkPermission(nai.networkCapabilities), /*secure=*/ false,
VpnManager.TYPE_VPN_NONE); VpnManager.TYPE_VPN_NONE, /*excludeLocalRoutes=*/ false);
} }
mNetd.networkCreate(config); mNetd.networkCreate(config);
mDnsResolver.createNetworkCache(nai.network.getNetId()); mDnsResolver.createNetworkCache(nai.network.getNetId());

4
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -3386,12 +3386,12 @@ public class ConnectivityServiceTest {
private NativeNetworkConfig nativeNetworkConfigPhysical(int netId, int permission) { private NativeNetworkConfig nativeNetworkConfigPhysical(int netId, int permission) {
return new NativeNetworkConfig(netId, NativeNetworkType.PHYSICAL, permission, return new NativeNetworkConfig(netId, NativeNetworkType.PHYSICAL, permission,
/*secure=*/ false, VpnManager.TYPE_VPN_NONE); /*secure=*/ false, VpnManager.TYPE_VPN_NONE, /*excludeLocalRoutes=*/ false);
} }
private NativeNetworkConfig nativeNetworkConfigVpn(int netId, boolean secure, int vpnType) { private NativeNetworkConfig nativeNetworkConfigVpn(int netId, boolean secure, int vpnType) {
return new NativeNetworkConfig(netId, NativeNetworkType.VIRTUAL, INetd.PERMISSION_NONE, return new NativeNetworkConfig(netId, NativeNetworkType.VIRTUAL, INetd.PERMISSION_NONE,
secure, vpnType); secure, vpnType, /*excludeLocalRoutes=*/ false);
} }
@Test @Test