Fix HostsideVpnTest#testExcludedRoutes
One of VpnTest#startVpn overloads didn't propagate "excludedRoutes" param, due to mistake during conflict resolution in aosp/1941233. Bug: 214398350 Test: atest HostsideVpnTests --iterations Change-Id: Icbbe7394f1ff1f676cc671a1fa1c4449f4d585e3
This commit is contained in:
@@ -334,9 +334,8 @@ public class VpnTest {
|
||||
@Nullable ProxyInfo proxyInfo,
|
||||
@Nullable ArrayList<Network> underlyingNetworks, boolean isAlwaysMetered)
|
||||
throws Exception {
|
||||
startVpn(addresses, routes, new String[0] /* excludedRoutes */, allowedApplications,
|
||||
disallowedApplications, proxyInfo, underlyingNetworks, isAlwaysMetered,
|
||||
false /* addRoutesByIpPrefix */);
|
||||
startVpn(addresses, routes, excludedRoutes, allowedApplications, disallowedApplications,
|
||||
proxyInfo, underlyingNetworks, isAlwaysMetered, false /* addRoutesByIpPrefix */);
|
||||
}
|
||||
|
||||
private void startVpn(
|
||||
|
||||
Reference in New Issue
Block a user