Swapping out @TargetApi for @RequiresApi
Bug: 1116486
Change-Id: Ic2058caec483b2a57019174f2baacb1a02718fc9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3443862
Reviewed-by: Peter Wen <wnwen@chromium.org>
Owners-Override: Peter Wen <wnwen@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#970928}
NOKEYCHECK=True
GitOrigin-RevId: 2d9dce07d9f2f043a17b190e93f89521a4e400be
diff --git a/BUILD.gn b/BUILD.gn
index fbe4d50..abefcea 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -48,7 +48,10 @@
# Android specific Java source files that are used to generate jni header files.
if (is_android) {
android_library("midi_java") {
- deps = [ "//base:base_java" ]
+ deps = [
+ "//base:base_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
+ ]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
sources = [
diff --git a/java/src/org/chromium/midi/MidiDeviceAndroid.java b/java/src/org/chromium/midi/MidiDeviceAndroid.java
index df9af4f..f5f01a1 100644
--- a/java/src/org/chromium/midi/MidiDeviceAndroid.java
+++ b/java/src/org/chromium/midi/MidiDeviceAndroid.java
@@ -4,11 +4,12 @@
package org.chromium.midi;
-import android.annotation.TargetApi;
import android.media.midi.MidiDevice;
import android.media.midi.MidiDeviceInfo;
import android.os.Build;
+import androidx.annotation.RequiresApi;
+
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
@@ -16,7 +17,7 @@
/**
* A class implementing midi::MidiDeviceAndroid functionality.
*/
-@TargetApi(Build.VERSION_CODES.M)
+@RequiresApi(Build.VERSION_CODES.M)
class MidiDeviceAndroid {
/**
* The underlying device.
diff --git a/java/src/org/chromium/midi/MidiInputPortAndroid.java b/java/src/org/chromium/midi/MidiInputPortAndroid.java
index 2b0e001..722fa23 100644
--- a/java/src/org/chromium/midi/MidiInputPortAndroid.java
+++ b/java/src/org/chromium/midi/MidiInputPortAndroid.java
@@ -4,12 +4,13 @@
package org.chromium.midi;
-import android.annotation.TargetApi;
import android.media.midi.MidiDevice;
import android.media.midi.MidiOutputPort;
import android.media.midi.MidiReceiver;
import android.os.Build;
+import androidx.annotation.RequiresApi;
+
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.annotations.NativeMethods;
@@ -22,7 +23,7 @@
* A MidiInputPortAndroid provides data to the associated midi::MidiInputPortAndroid object.
*/
@JNINamespace("midi")
-@TargetApi(Build.VERSION_CODES.M)
+@RequiresApi(Build.VERSION_CODES.M)
class MidiInputPortAndroid {
/**
* The underlying port.
diff --git a/java/src/org/chromium/midi/MidiManagerAndroid.java b/java/src/org/chromium/midi/MidiManagerAndroid.java
index 953571c..3b63265 100644
--- a/java/src/org/chromium/midi/MidiManagerAndroid.java
+++ b/java/src/org/chromium/midi/MidiManagerAndroid.java
@@ -4,7 +4,6 @@
package org.chromium.midi;
-import android.annotation.TargetApi;
import android.content.Context;
import android.content.pm.PackageManager;
import android.media.midi.MidiDevice;
@@ -13,6 +12,8 @@
import android.os.Build;
import android.os.Handler;
+import androidx.annotation.RequiresApi;
+
import org.chromium.base.ContextUtils;
import org.chromium.base.ThreadUtils;
import org.chromium.base.annotations.CalledByNative;
@@ -28,7 +29,7 @@
* A Java class implementing midi::MidiManagerAndroid functionality.
*/
@JNINamespace("midi")
-@TargetApi(Build.VERSION_CODES.M)
+@RequiresApi(Build.VERSION_CODES.M)
class MidiManagerAndroid {
/**
* Set true when this instance is successfully initialized.
diff --git a/java/src/org/chromium/midi/MidiOutputPortAndroid.java b/java/src/org/chromium/midi/MidiOutputPortAndroid.java
index 7baa7ea..29996be 100644
--- a/java/src/org/chromium/midi/MidiOutputPortAndroid.java
+++ b/java/src/org/chromium/midi/MidiOutputPortAndroid.java
@@ -4,11 +4,12 @@
package org.chromium.midi;
-import android.annotation.TargetApi;
import android.media.midi.MidiDevice;
import android.media.midi.MidiInputPort;
import android.os.Build;
+import androidx.annotation.RequiresApi;
+
import org.chromium.base.Log;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
@@ -21,7 +22,7 @@
// Note "OutputPort" is named in the Web MIDI manner. It corresponds to MidiInputPort class in the
// Android API.
@JNINamespace("midi")
-@TargetApi(Build.VERSION_CODES.M)
+@RequiresApi(Build.VERSION_CODES.M)
class MidiOutputPortAndroid {
/**
* The underlying port.