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

Commit 9101f315 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AudioDeviceInventory: Fix for switching leaudio active/inactive" am:... 

Merge "AudioDeviceInventory: Fix for switching leaudio active/inactive" am: 810cf114 am: 94964fc7

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

Change-Id: I0e39b9f7cd5ca8b68bc00d42a342ff21c9939749
parents b0b2e115 94964fc7

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -1088,6 +1088,12 @@ public class AudioDeviceInventory { 
    private void makeLeAudioDeviceAvailable(String address, String name, int streamType, int device,

    private void makeLeAudioDeviceAvailable(String address, String name, int streamType, int device,

            String eventSource) {

            String eventSource) {

        if (device != AudioSystem.DEVICE_NONE) {

        if (device != AudioSystem.DEVICE_NONE) {



            /* Audio Policy sees Le Audio similar to A2DP. Let's make sure

             * AUDIO_POLICY_FORCE_NO_BT_A2DP is not set

             */

            mDeviceBroker.setBluetoothA2dpOnInt(true, false /*fromA2dp*/, eventSource);



            AudioSystem.setDeviceConnectionState(device, AudioSystem.DEVICE_STATE_AVAILABLE,

            AudioSystem.setDeviceConnectionState(device, AudioSystem.DEVICE_STATE_AVAILABLE,

                    address, name, AudioSystem.AUDIO_FORMAT_DEFAULT);

                    address, name, AudioSystem.AUDIO_FORMAT_DEFAULT);

            mConnectedDevices.put(DeviceInfo.makeDeviceListKey(device, address),

            mConnectedDevices.put(DeviceInfo.makeDeviceListKey(device, address),