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

Commit 872e2a41 authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Gerrit Code Review
Browse files

Merge "Mirrors calls to suspend LE Audio with those for A2DP"

parents ebd07bca f86450f9

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

+6 −0
Original line number Diff line number Diff line
@@ -1209,6 +1209,9 @@ public class AudioDeviceInventory { 
                        "LE Audio device addr=" + address + " now available").printLog(TAG));

            }



            // Reset LEA suspend state each time a new sink is connected

            mAudioSystem.setParameters("LeAudioSuspended=false");



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

                    new DeviceInfo(device, name, address, AudioSystem.AUDIO_FORMAT_DEFAULT));

            mDeviceBroker.postAccessoryPlugMediaUnmute(device);
@@ -1254,6 +1257,9 @@ public class AudioDeviceInventory { 


    @GuardedBy("mDevicesLock")

    private void makeLeAudioDeviceUnavailableLater(String address, int device, int delayMs) {

        // prevent any activity on the LEA output to avoid unwanted

        // reconnection of the sink.

        mAudioSystem.setParameters("LeAudioSuspended=true");

        // the device will be made unavailable later, so consider it disconnected right away

        mConnectedDevices.remove(DeviceInfo.makeDeviceListKey(device, address));

        // send the delayed message to make the device unavailable later

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

+1 −0
Original line number Diff line number Diff line
@@ -477,6 +477,7 @@ public class BtHelper { 
        mScoAudioState = SCO_STATE_INACTIVE;

        broadcastScoConnectionState(AudioManager.SCO_AUDIO_STATE_DISCONNECTED);

        AudioSystem.setParameters("A2dpSuspended=false");

        AudioSystem.setParameters("LeAudioSuspended=false");

        mDeviceBroker.setBluetoothScoOn(false, "resetBluetoothSco");

    }