Merge "Set min_sdk_version" am: 3f96b18942
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2138457
Change-Id: I219c772b8e275eec3257a7bf89aa091e8fe88359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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",
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";