From 6d1ea2bb16451e43b5a2c3da30b49ecfc40037cc Mon Sep 17 00:00:00 2001 From: Ayush Sharma Date: Thu, 16 Dec 2021 14:40:13 +0000 Subject: Revert "Unhide RouteInfo#getType and related fields" Revert "Add APIs that allow to exclude routes from VPN" Revert "Suppress NewApi warnings for @SystemApi -> public APIs" Revert "Add VpnServiceBuilderShim for VpnService.Builder" Revert submission 1551943-vpn-impl Reason for revert: , bug b/210979001 Reverted Changes: I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ... I59b9185cf:Unhide RouteInfo#getType and related fields Ie5b62b2b2:Unhide IpPrefix(InetAddress, int) I993a32d40:Add CTS tests for exclude VPN routes APIs Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ... Ic3b10464a:Add APIs that allow to exclude routes from VPN Change-Id: I98d3b998e4702f56e9d5e17944238b283b29f2b2 BUG: 210979001 --- tests/common/java/android/net/RouteInfoTest.java | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'tests/common/java/android/net/RouteInfoTest.java') diff --git a/tests/common/java/android/net/RouteInfoTest.java b/tests/common/java/android/net/RouteInfoTest.java index b69b04561b..71689f9197 100644 --- a/tests/common/java/android/net/RouteInfoTest.java +++ b/tests/common/java/android/net/RouteInfoTest.java @@ -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; -- cgit v1.2.3