diff options
| author | 2023-02-14 02:42:36 +0000 | |
|---|---|---|
| committer | 2023-02-14 02:42:36 +0000 | |
| commit | 8705c156bd6deb3496c0c9b1c023d57de6fb681e (patch) | |
| tree | c1e854b2cd17f4146801812c825ed0972b7f2bf5 /packages/SettingsLib/src | |
| parent | 0ba0cdcb6420463000a5f22d838f6ed9fea4da73 (diff) | |
| parent | ef7d75e7401677fe22922d0be290d52f054e8395 (diff) | |
Merge "Revert "Upgrade RequireAPI annotation to prevent wrong lint error."" am: 92bfdc6bd7 am: ef7d75e740
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2427231
Change-Id: I829c7dee48fd292027b322252369bf75bc380996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'packages/SettingsLib/src')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java | 4 |
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 1a65717e73f9..19409865284c 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.UPSIDE_DOWN_CAKE) + @RequiresApi(Build.VERSION_CODES.TIRAMISU) 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.UPSIDE_DOWN_CAKE) + @RequiresApi(Build.VERSION_CODES.TIRAMISU) public String getHighQualityAudioOptionLabel(BluetoothDevice device) { BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice(); int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec; |