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

Commit cfe3dc56 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Gerrit Code Review
Browse files

Merge "Fix AudioDeviceInventory#disconnectLeAudio"

parents 00545d0f 80786db7

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

+4 −2
Original line number Diff line number Diff line
@@ -829,8 +829,8 @@ public class AudioDeviceInventory { 
    }



     /*package*/ void disconnectLeAudio(int device) {

        if (device != AudioSystem.DEVICE_OUT_BLE_HEADSET ||

                    device != AudioSystem.DEVICE_OUT_BLE_BROADCAST) {

        if (device != AudioSystem.DEVICE_OUT_BLE_HEADSET

                && device != AudioSystem.DEVICE_OUT_BLE_BROADCAST) {

            Log.e(TAG, "disconnectLeAudio: Can't disconnect not LE Audio device " + device);

            return;

        }
@@ -846,6 +846,8 @@ public class AudioDeviceInventory { 
            new MediaMetrics.Item(mMetricsId + "disconnectLeAudio")

                    .record();

            if (toRemove.size() > 0) {

                final int delay = checkSendBecomingNoisyIntentInt(device, 0,

                        AudioSystem.DEVICE_NONE);

                toRemove.stream().forEach(deviceAddress ->

                        makeLeAudioDeviceUnavailable(deviceAddress, device)

                );

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

+2 −0
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ public class BtHelper { 
        mDeviceBroker.postBtProfileDisconnected(BluetoothProfile.HEADSET);

        mDeviceBroker.postBtProfileDisconnected(BluetoothProfile.HEARING_AID);

        mDeviceBroker.postBtProfileDisconnected(BluetoothProfile.LE_AUDIO);

        mDeviceBroker.postBtProfileDisconnected(BluetoothProfile.LE_AUDIO_BROADCAST);

    }



    // @GuardedBy("AudioDeviceBroker.mSetModeLock")
@@ -675,6 +676,7 @@ public class BtHelper { 
                        case BluetoothProfile.HEADSET:

                        case BluetoothProfile.HEARING_AID:

                        case BluetoothProfile.LE_AUDIO:

                        case BluetoothProfile.LE_AUDIO_BROADCAST:

                            mDeviceBroker.postBtProfileDisconnected(profile);

                            break;