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

Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT"

Browse Source 
* changes:
  Revert "Unhide RouteInfo#getType and related fields"
  Revert "Unhide IpPrefix(InetAddress, int)"
  Revert "Add CTS tests for exclude VPN routes APIs"
This commit is contained in:
Ayush Sharma
2021-12-16 15:01:30 +00:00
committed by Gerrit Code Review
parent 3c1e7398a4 6d1ea2bb16
commit e89170bcb1
12 changed files with 70 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,9 +122,6 @@ 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,8 +16,6 @@
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;
@@ -330,16 +328,6 @@ 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;