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

Commit 53a9eb7f authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Upgrade RequireAPI annotation to prevent wrong lint error." am: e8d4b0ed 

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



Change-Id: I3c2a9dd2022218e93b8b36949511798ca2e2e934
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa87ee6f e8d4b0ed

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.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;