commit 5a620a10acf766ec7ae1d9cf43b99647cc4b86a7
author Ayush Sharma <ayushsha@google.com> Thu Dec 16 15:55:07 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 16 15:55:07 2021 +0000
tree c10133348fbad235d7df806ee2fbf0011707f4ce
parent df713e5202c1414fd8305246a86e653be361a912
parent 7d1730a5b3dd5288f32d194569c6386aa2f39ce9

Merge "Revert "Suppress NewApi warnings for @SystemApi -> public APIs"" am: 9a3f0adc35 am: 54d38f85da

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1927300

Change-Id: I1f5812280459367eb5b4d98cadb0b216447d78e0

staticlibs/client-libs/netd/com/android/net/module/util/NetdUtils.java

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()) {