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: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, 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
diff --git a/framework/src/android/net/RouteInfo.java b/framework/src/android/net/RouteInfo.java
index df5f151..fad3144 100644
--- a/framework/src/android/net/RouteInfo.java
+++ b/framework/src/android/net/RouteInfo.java
@@ -86,26 +86,16 @@
private final String mInterface;
- /**
- * Unicast route.
- *
- * Indicates that destination is reachable directly or via gateway.
- **/
+ /** Unicast route. @hide */
+ @SystemApi
public static final int RTN_UNICAST = 1;
- /**
- * Unreachable route.
- *
- * Indicates that destination is unreachable.
- **/
+ /** Unreachable route. @hide */
+ @SystemApi
public static final int RTN_UNREACHABLE = 7;
- /**
- * Throw route.
- *
- * Indicates that routing information about this destination is not in this table.
- * Routing lookup should continue in another table.
- **/
+ /** Throw route. @hide */
+ @SystemApi
public static final int RTN_THROW = 9;
/**
@@ -401,7 +391,10 @@
* Retrieves the type of this route.
*
* @return The type of this route; one of the {@code RTN_xxx} constants defined in this class.
+ *
+ * @hide
*/
+ @SystemApi
@RouteType
public int getType() {
return mType;