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

Commit 6252b8c2 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Jakub Pawłowski
Browse files

DO NOT MERGE: Audio: log LE Audio device made avaliable/unavaliable 

Test: adb shell dumpsys audio
Bug: 263209656
Change-Id: Ie4e6b6a59d95a47e9723bd9433aaa35aef7a2866
parent 3528f212

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

+26 −2
Original line number Diff line number Diff line
@@ -1187,9 +1187,21 @@ public class AudioDeviceInventory { 
             */

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



            AudioSystem.setDeviceConnectionState(new AudioDeviceAttributes(device, address, name),

            final int res = AudioSystem.setDeviceConnectionState(new AudioDeviceAttributes(

                    device, address, name),

                    AudioSystem.DEVICE_STATE_AVAILABLE,

                    AudioSystem.AUDIO_FORMAT_DEFAULT);

            if (res != AudioSystem.AUDIO_STATUS_OK) {

                AudioService.sDeviceLogger.log(new AudioEventLogger.StringEvent(

                        "APM failed to make available LE Audio device addr=" + address

                                + " error=" + res).printLog(TAG));

                // TODO: connection failed, stop here

                // TODO: return;

            } else {

                AudioService.sDeviceLogger.log(new AudioEventLogger.StringEvent(

                        "LE Audio device addr=" + address + " now available").printLog(TAG));

            }



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

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

            mDeviceBroker.postAccessoryPlugMediaUnmute(device);
@@ -1212,9 +1224,21 @@ public class AudioDeviceInventory { 
    @GuardedBy("mDevicesLock")

    private void makeLeAudioDeviceUnavailable(String address, int device) {

        if (device != AudioSystem.DEVICE_NONE) {

            AudioSystem.setDeviceConnectionState(new AudioDeviceAttributes(device, address),

            final int res = AudioSystem.setDeviceConnectionState(new AudioDeviceAttributes(

                    device, address),

                    AudioSystem.DEVICE_STATE_UNAVAILABLE,

                    AudioSystem.AUDIO_FORMAT_DEFAULT);



            if (res != AudioSystem.AUDIO_STATUS_OK) {

                AudioService.sDeviceLogger.log(new AudioEventLogger.StringEvent(

                        "APM failed to make unavailable LE Audio device addr=" + address

                                + " error=" + res).printLog(TAG));

                // TODO:  failed to disconnect, stop here

                // TODO: return;

            } else {

                AudioService.sDeviceLogger.log((new AudioEventLogger.StringEvent(

                        "LE Audio device addr=" + address + " made unavailable")).printLog(TAG));

            }

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

        }