From 0ad52839e7487955f3e0de71adc80272abd0043f Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Mon, 7 Jun 2021 08:50:02 +0000
Subject: [PATCH] Revert "Add min_sdk_version to connectivity targets"

This reverts commit 326f7bb0231a90e4f54f536d9d75fb8af649e4d6.

Reason for revert: broke errorprone:
"Error: Call requires API level 31 (current min is 30)"

Bug: 190350403
Change-Id: Ib778ba7a882dabc4d42ab9689e1cc51d09d9be62
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
---
 framework/Android.bp                                 |  7 -------
 service/Android.bp                                   | 12 +++++-------
 service/ServiceConnectivityResources/Android.bp      |  1 -
 .../jni/com_android_server_TestNetworkService.cpp    |  7 +++++--
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/framework/Android.bp b/framework/Android.bp
index a969c835d6..4fa9ccbc02 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -22,7 +22,6 @@ package {
 java_library {
     name: "framework-connectivity-protos",
     sdk_version: "module_current",
-    min_sdk_version: "30",
     proto: {
         type: "nano",
     },
@@ -106,10 +105,6 @@ cc_defaults {
         "-Wall",
         "-Werror",
         "-Wno-unused-parameter",
-        // Don't warn about S API usage even with
-        // min_sdk 30: the library is only loaded
-        // on S+ devices
-        "-Wno-unguarded-availability",
         "-Wthread-safety",
     ],
     shared_libs: [
@@ -136,7 +131,6 @@ cc_library_static {
 
 cc_library_shared {
     name: "libframework-connectivity-jni",
-    min_sdk_version: "30",
     defaults: ["libframework-connectivity-defaults"],
     srcs: [
         "jni/android_net_NetworkUtils.cpp",
@@ -153,7 +147,6 @@ cc_library_shared {
 java_library {
     name: "framework-connectivity.impl",
     sdk_version: "module_current",
-    min_sdk_version: "30",
     srcs: [
         ":framework-connectivity-sources",
     ],
diff --git a/service/Android.bp b/service/Android.bp
index b07c55fdf7..ec8887cad4 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -21,7 +21,7 @@ package {
 
 cc_library_shared {
     name: "libservice-connectivity",
-    min_sdk_version: "30",
+    // TODO: build against the NDK (sdk_version: "30" for example)
     cflags: [
         "-Wall",
         "-Werror",
@@ -33,12 +33,13 @@ cc_library_shared {
         "jni/onload.cpp",
     ],
     stl: "libc++_static",
-    header_libs: [
-        "libbase_headers",
-    ],
     shared_libs: [
+        "libbase",
         "liblog",
         "libnativehelper",
+        // TODO: remove dependency on ifc_[add/del]_address by having Java code to add/delete
+        // addresses, and remove dependency on libnetutils.
+        "libnetutils",
     ],
     apex_available: [
         "com.android.tethering",
@@ -48,7 +49,6 @@ cc_library_shared {
 java_library {
     name: "service-connectivity-pre-jarjar",
     sdk_version: "system_server_current",
-    min_sdk_version: "30",
     srcs: [
         "src/**/*.java",
         ":framework-connectivity-shared-srcs",
@@ -87,7 +87,6 @@ java_library {
 java_library {
     name: "service-connectivity-protos",
     sdk_version: "system_current",
-    min_sdk_version: "30",
     proto: {
         type: "nano",
     },
@@ -104,7 +103,6 @@ java_library {
 java_library {
     name: "service-connectivity",
     sdk_version: "system_server_current",
-    min_sdk_version: "30",
     installable: true,
     static_libs: [
         "service-connectivity-pre-jarjar",
diff --git a/service/ServiceConnectivityResources/Android.bp b/service/ServiceConnectivityResources/Android.bp
index f491cc762b..912d99f468 100644
--- a/service/ServiceConnectivityResources/Android.bp
+++ b/service/ServiceConnectivityResources/Android.bp
@@ -22,7 +22,6 @@ package {
 android_app {
     name: "ServiceConnectivityResources",
     sdk_version: "module_30",
-    min_sdk_version: "30",
     resource_dirs: [
         "res",
     ],
diff --git a/service/jni/com_android_server_TestNetworkService.cpp b/service/jni/com_android_server_TestNetworkService.cpp
index e7a40e5ea6..36a6fde361 100644
--- a/service/jni/com_android_server_TestNetworkService.cpp
+++ b/service/jni/com_android_server_TestNetworkService.cpp
@@ -35,6 +35,8 @@
 
 #include <log/log.h>
 
+#include "netutils/ifc.h"
+
 #include "jni.h"
 #include <android-base/stringprintf.h>
 #include <android-base/unique_fd.h>
@@ -46,8 +48,9 @@ namespace android {
 //------------------------------------------------------------------------------
 
 static void throwException(JNIEnv* env, int error, const char* action, const char* iface) {
-    const std::string& msg = "Error: " + std::string(action) + " " + std::string(iface) +  ": "
-                + std::string(strerror(error));
+    const std::string& msg =
+        android::base::StringPrintf("Error %s %s: %s", action, iface, strerror(error));
+
     jniThrowException(env, "java/lang/IllegalStateException", msg.c_str());
 }