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

Merge changes from topic "vpn-impl"

Browse Source 
* changes:
  Add CTS tests for exclude VPN routes APIs
  Unhide IpPrefix(InetAddress, int)
  Unhide RouteInfo#getType and related fields
This commit is contained in:
Taras Antoshchuk
2021-12-16 11:13:33 +00:00
committed by Gerrit Code Review
parent 5c4010e196 673eb6ecd2
commit 8be6ba36dc
12 changed files with 285 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/common/java/android/net/IpPrefixTest.java
View File

@@ -122,6 +122,9 @@ public class IpPrefixTest {
p = new IpPrefix("[2001:db8::123]/64");
assertEquals("2001:db8::/64", p.toString());
p = new IpPrefix(InetAddresses.parseNumericAddress("::128"), 64);
assertEquals("::/64", p.toString());
}
@Test

12
tests/common/java/android/net/RouteInfoTest.java
View File

@@ -16,6 +16,8 @@
package android.net;
import static android.net.RouteInfo.RTN_THROW;
import static android.net.RouteInfo.RTN_UNICAST;
import static android.net.RouteInfo.RTN_UNREACHABLE;
import static com.android.testutils.MiscAsserts.assertEqualBothWays;
@@ -328,6 +330,16 @@ public class RouteInfoTest {
}
}
@Test
public void testRouteTypes() {
RouteInfo r = new RouteInfo(new IpPrefix(Inet6Address.ANY, 0), RTN_UNREACHABLE);
assertEquals(RTN_UNREACHABLE, r.getType());
r = new RouteInfo(new IpPrefix(Inet6Address.ANY, 0), RTN_UNICAST);
assertEquals(RTN_UNICAST, r.getType());
r = new RouteInfo(new IpPrefix(Inet6Address.ANY, 0), RTN_THROW);
assertEquals(RTN_THROW, r.getType());
}
@Test
public void testTruncation() {
LinkAddress l;