commit c68b0d278eba14e4e259811ab976102eef84a1e3
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jul 04 14:01:20 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 04 14:01:20 2022 +0000
tree fab04fd97df27b8efc20e9240739f41ebd9da8ae
parent 1cd219815b56b376cd8de5deb65c23c6b60a2999
parent b3b6798adc4c6bc45a680d825cba45525913992d

Merge "Set min_sdk_version"

staticlibs/Android.bp

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 81e985c..a3ec405 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -231,7 +231,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";