commit b3b6798adc4c6bc45a680d825cba45525913992d
author Jooyung Han <jooyung@google.com> Fri Jun 24 14:56:24 2022 +0900
committer Jooyung Han <jooyung@google.com> Wed Jun 29 22:09:32 2022 +0000
tree e4c9b48001a6a15ec88fca636013c75a2d88fb41
parent 1126aa72ecb8e7a24c390831d14ad2fa90084cb6

Set min_sdk_version

This was done via the hard-coded list in build/soong.


Bug: 158059172
Test: m
Merged-In: Icae85d5f4564ee3f04bacb0d3dad7a80d70ee443
Change-Id: Icae85d5f4564ee3f04bacb0d3dad7a80d70ee443
(cherry picked from commit 6e043e136d3390f44e84bb57e4a8eeb4ec25d838)

staticlibs/Android.bp

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 31a7262..66c9eaf 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -232,7 +232,9 @@
         ":net-utils-framework-common-srcs",
     ],
     sdk_version: "module_current",
+    min_sdk_version: "29",
     libs: [
+        "androidx.annotation_annotation",
         "framework-annotations-lib",
         "framework-connectivity.stubs.module_lib",
         "framework-connectivity-t.stubs.module_lib",

staticlibs/framework/com/android/net/module/util/LocationPermissionChecker.java

diff --git a/staticlibs/framework/com/android/net/module/util/LocationPermissionChecker.java b/staticlibs/framework/com/android/net/module/util/LocationPermissionChecker.java
index e4ce9e8..cd1f31c 100644
--- a/staticlibs/framework/com/android/net/module/util/LocationPermissionChecker.java
+++ b/staticlibs/framework/com/android/net/module/util/LocationPermissionChecker.java
@@ -30,6 +30,8 @@
 import android.os.UserHandle;
 import android.util.Log;
 
+import androidx.annotation.RequiresApi;
+
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.lang.annotation.Retention;
@@ -41,6 +43,7 @@
  *
  * @hide
  */
+@RequiresApi(Build.VERSION_CODES.R)
 public class LocationPermissionChecker {
 
     private static final String TAG = "LocationPermissionChecker";