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

Commit 41ca6241 authored by Zhou Song's avatar Zhou Song Committed by Bruno Martins
Browse files

Audio: use cached BT codec info during disconnecting 

When disconnecting BT device, BT device state machine may be
destroyed and cause query of codec failed.
This can make device disconnection failed in low layer audio
service.

CRs-Fixed: 2604724
Change-Id: I970802310eae0b5b43340aaddb312906e1a4c444
parent e127854e

services/core/java/com/android/server/audio/AudioDeviceInventory.java

+15 −1
Original line number Diff line number Diff line
@@ -893,7 +893,21 @@ public class AudioDeviceInventory { 
                delay = 0;

            }



            final int a2dpCodec = mDeviceBroker.getA2dpCodec(device);

            final int a2dpCodec;

            if (state == BluetoothA2dp.STATE_DISCONNECTED) {

                final String key =

                        DeviceInfo.makeDeviceListKey(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                                device.getAddress());

                final DeviceInfo di = mConnectedDevices.get(key);

                if (di != null) {

                    a2dpCodec = di.mDeviceCodecFormat;

                } else {

                    Log.e(TAG, "invalid null DeviceInfo in setBluetoothA2dpDeviceConnectionState");

                    return;

                }

            } else {

                a2dpCodec = mDeviceBroker.getA2dpCodec(device);

            }



            if (AudioService.DEBUG_DEVICES) {

                Log.i(TAG, "setBluetoothA2dpDeviceConnectionState device: " + device