Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Upgrade RequireAPI annotation to prevent wrong lint error."" am: 92bfdc6bd7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2427231

Change-Id: I68c5e5a7aa89f6406864bb8c266818129cf6394e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack He
2023-02-14 01:58:06 +00:00
committed by Automerger Merge Worker
parent ca795a5bcf 92bfdc6bd7
commit ef7d75e740
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
View File

@@ -236,7 +236,7 @@ public class A2dpProfile implements LocalBluetoothProfile {
/** /**
* @return whether high quality audio is enabled or not * @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) { public boolean isHighQualityAudioEnabled(BluetoothDevice device) {
BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice(); BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();
if (bluetoothDevice == null) { if (bluetoothDevice == null) {
@@ -288,7 +288,7 @@ public class A2dpProfile implements LocalBluetoothProfile {
* @param device to get codec label from * @param device to get codec label from
* @return the label associated with the device codec * @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) { public String getHighQualityAudioOptionLabel(BluetoothDevice device) {
BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice(); BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();
int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec; int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec;