| commit | 95c8d0b833fef36b4deb0af530b5c92d61e21807 | [log] [tgz] |
|---|---|---|
| author | Ayush Sharma <ayushsha@google.com> | Thu Dec 16 14:40:13 2021 +0000 |
| committer | Ayush Sharma <ayushsha@google.com> | Thu Dec 16 14:40:13 2021 +0000 |
| tree | c10133348fbad235d7df806ee2fbf0011707f4ce | |
| parent | 00ef48f122269a98f0a577b725f5291c80a492e5 [diff] |
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: I5b918dbf4293168c2a02cfe1c0f6ca8342b3195c BUG: 210979001
diff --git a/staticlibs/client-libs/netd/com/android/net/module/util/NetdUtils.java b/staticlibs/client-libs/netd/com/android/net/module/util/NetdUtils.java index de13d42..e78e336 100644 --- a/staticlibs/client-libs/netd/com/android/net/module/util/NetdUtils.java +++ b/staticlibs/client-libs/netd/com/android/net/module/util/NetdUtils.java
@@ -23,7 +23,6 @@ import static android.net.RouteInfo.RTN_UNREACHABLE; import static android.system.OsConstants.EBUSY; -import android.annotation.SuppressLint; import android.net.INetd; import android.net.InterfaceConfigurationParcel; import android.net.IpPrefix; @@ -214,7 +213,6 @@ return failures; } - @SuppressLint("NewApi") private static String findNextHop(final RouteInfo route) { final String nextHop; switch (route.getType()) {