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

Commit 8f8ee847 authored by Ugo Yu's avatar Ugo Yu
Browse files

Remove SCO devices if Bluetooth process is dead 

Fix Bluetooth device stuck in device list forever if Bluetooth
crashed and any HFP device was connected at this moment.
Make sure all kind of device class of the BT address are removed
from the list.

Bug: 79509110
Test: kill com.android.bluetooth while HFP is connected.
Change-Id: I0d717bcc4c2182f1ac834d67b8227c9773639c7f
parent 09a0c2d5

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

+15 −6
Original line number Diff line number Diff line
@@ -3653,26 +3653,35 @@ public class AudioService extends IAudioService.Stub 
        }

        String address = btDevice.getAddress();

        BluetoothClass btClass = btDevice.getBluetoothClass();

        int outDevice = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO;

        int inDevice = AudioSystem.DEVICE_IN_BLUETOOTH_SCO_HEADSET;

        int[] outDeviceTypes = {

            AudioSystem.DEVICE_OUT_BLUETOOTH_SCO,

            AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET,

            AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT

        };

        if (btClass != null) {

            switch (btClass.getDeviceClass()) {

                case BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET:

                case BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE:

                    outDevice = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET;

                    outDeviceTypes = new int[] { AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET };

                    break;

                case BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO:

                    outDevice = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT;

                    outDeviceTypes = new int[] { AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT };

                    break;

            }

        }



        if (!BluetoothAdapter.checkBluetoothAddress(address)) {

            address = "";

        }



        String btDeviceName =  btDevice.getName();

        boolean result = handleDeviceConnection(isActive, outDevice, address, btDeviceName);

        boolean result = false;

        if (isActive) {

            result |= handleDeviceConnection(isActive, outDeviceTypes[0], address, btDeviceName);

        } else {

            for (int outDeviceType : outDeviceTypes) {

                result |= handleDeviceConnection(isActive, outDeviceType, address, btDeviceName);

            }

        }

        // handleDeviceConnection() && result to make sure the method get executed

        result = handleDeviceConnection(isActive, inDevice, address, btDeviceName) && result;

        return result;