Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8705c156 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Revert "Upgrade RequireAPI annotation to prevent wrong lint error.""... 

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

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



Change-Id: I829c7dee48fd292027b322252369bf75bc380996
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ba0cdcb ef7d75e7

packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java

+2 −2
Original line number Diff line number Diff line
@@ -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;