summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Etienne Ruffieux <eruffieux@google.com> 2022-10-21 21:15:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-21 21:15:55 +0000
commit2cef4b559a4520a6d5fc09e03b712694e0199c9c (patch)
treec1744b8a75e4d99c7d9f3535017dc6e012eca733
parentc35a20a300b9c8284d7f454e05f9f3acd7497a4f (diff)
parent53a9eb7f04e42c29b83f8163cd11614cac7a02ec (diff)
Merge "Upgrade RequireAPI annotation to prevent wrong lint error." am: e8d4b0ed09 am: 53a9eb7f04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2240043 Change-Id: I4be0cc3ce9244642eb9bc3fb64b7b565c22adcb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
index 19409865284c..1a65717e73f9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
@@ -236,7 +236,7 @@ public class A2dpProfile implements LocalBluetoothProfile {
/**
* @return whether high quality audio is enabled or not
*/
- @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+ @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
public boolean isHighQualityAudioEnabled(BluetoothDevice device) {
BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();
if (bluetoothDevice == null) {
@@ -288,7 +288,7 @@ public class A2dpProfile implements LocalBluetoothProfile {
* @param device to get codec label from
* @return the label associated with the device codec
*/
- @RequiresApi(Build.VERSION_CODES.TIRAMISU)
+ @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
public String getHighQualityAudioOptionLabel(BluetoothDevice device) {
BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();
int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec;