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

Commit e7b7aeaf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix AudioDeviceInventory#disconnectLeAudio" into tm-dev am: d883c270 am: 9dac50b2 

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



Change-Id: I57b14ae76670696da4f8d5c6a70893a2da12935e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ff5f2fcf 9dac50b2

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

+4 −2
Original line number Diff line number Diff line
@@ -862,8 +862,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;

        }
@@ -879,6 +879,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
@@ -462,6 +462,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")
@@ -687,6 +688,7 @@ public class BtHelper { 
                        case BluetoothProfile.HEADSET:

                        case BluetoothProfile.HEARING_AID:

                        case BluetoothProfile.LE_AUDIO:

                        case BluetoothProfile.LE_AUDIO_BROADCAST:

                            mDeviceBroker.postBtProfileDisconnected(profile);

                            break;