From 583e35a12e6d206a1e0036d54db8288dd54f56e9 Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Sat, 31 Oct 2020 22:41:41 +0000
Subject: [PATCH] com.android.tethering: set min_sdk_version 30

Tethering is updatable apex module that was launched in R, hence it and
all it dependencies should specify min_sdk_version <= 30.

Test: m
Bug: 171668006
Bug: 171330443
Change-Id: Ic91cf96dda6419d1038b0329b920f9cd24482aef
Merged-In: Ic91cf96dda6419d1038b0329b920f9cd24482aef
(cherry picked from commit bee20e84f87514b90c4b701b31582a7931c6e2ca)
(cherry picked from commit 1fe1e539e1d718ddc0a9a62b9a3d01ad22e7e699)
---
 Tethering/Android.bp                     | 7 ++++---
 Tethering/apex/Android.bp                | 2 +-
 Tethering/common/TetheringLib/Android.bp | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Tethering/Android.bp b/Tethering/Android.bp
index 5526c657b8..23aa7f8d51 100644
--- a/Tethering/Android.bp
+++ b/Tethering/Android.bp
@@ -17,6 +17,7 @@
 java_defaults {
     name: "TetheringAndroidLibraryDefaults",
     sdk_version: "module_current",
+    min_sdk_version: "30",
     srcs: [
         "src/**/*.java",
         ":framework-tethering-shared-srcs",
@@ -58,7 +59,7 @@ cc_library {
         "//apex_available:platform", // Used by InProcessTethering
         "com.android.tethering",
     ],
-    min_sdk_version: "current",
+    min_sdk_version: "30",
     srcs: [
         "jni/android_net_util_TetheringUtils.cpp",
     ],
@@ -119,7 +120,7 @@ android_app {
     // InProcessTethering is a replacement for Tethering
     overrides: ["Tethering"],
     apex_available: ["com.android.tethering"],
-    min_sdk_version: "current",
+    min_sdk_version: "30",
 }
 
 // Updatable tethering packaged as an application
@@ -133,5 +134,5 @@ android_app {
     // The permission configuration *must* be included to ensure security of the device
     required: ["NetworkPermissionConfig"],
     apex_available: ["com.android.tethering"],
-    min_sdk_version: "current",
+    min_sdk_version: "30",
 }
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index 05243749f7..a1e7fd218d 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -17,7 +17,7 @@
 apex {
     name: "com.android.tethering",
     updatable: true,
-    min_sdk_version: "current",
+    min_sdk_version: "30",
     java_libs: ["framework-tethering"],
     bpfs: ["offload.o"],
     apps: ["Tethering"],
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index ddb6880753..a10729daff 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -29,6 +29,7 @@ java_sdk_library {
     hostdex: true, // for hiddenapi check
     apex_available: ["com.android.tethering"],
     permitted_packages: ["android.net"],
+    min_sdk_version: "30",
 }
 
 filegroup {