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

Commit c7976419 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Gerrit Code Review
Browse files

Merge "Removed getActiveDevice call to BluetoothProfile"

parents 128ebcdb eec89357

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

+4 −4
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public class A2dpProfile implements LocalBluetoothProfile { 
    }



    public boolean supportsHighQualityAudio(BluetoothDevice device) {

        BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice();

        BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();

        if (bluetoothDevice == null) {

            return false;

        }
@@ -236,7 +236,7 @@ public class A2dpProfile implements LocalBluetoothProfile { 
     */

    @RequiresApi(Build.VERSION_CODES.TIRAMISU)

    public boolean isHighQualityAudioEnabled(BluetoothDevice device) {

        BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice();

        BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();

        if (bluetoothDevice == null) {

            return false;

        }
@@ -262,7 +262,7 @@ public class A2dpProfile implements LocalBluetoothProfile { 
    }



    public void setHighQualityAudioEnabled(BluetoothDevice device, boolean enabled) {

        BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice();

        BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();

        if (bluetoothDevice == null) {

            return;

        }
@@ -288,7 +288,7 @@ public class A2dpProfile implements LocalBluetoothProfile { 
     */

    @RequiresApi(Build.VERSION_CODES.TIRAMISU)

    public String getHighQualityAudioOptionLabel(BluetoothDevice device) {

        BluetoothDevice bluetoothDevice = (device != null) ? device : mService.getActiveDevice();

        BluetoothDevice bluetoothDevice = (device != null) ? device : getActiveDevice();

        int unknownCodecId = R.string.bluetooth_profile_a2dp_high_quality_unknown_codec;

        if (bluetoothDevice == null || !supportsHighQualityAudio(device)

                || getConnectionStatus(device) != BluetoothProfile.STATE_CONNECTED) {