diff options
| author | 2024-01-25 17:00:14 +0000 | |
|---|---|---|
| committer | 2024-01-25 17:00:14 +0000 | |
| commit | 9c539c7be70feee0b249e2ee08b5d7cdb66d2fdd (patch) | |
| tree | f2fcda0e2510a5df2183658e8f1502d391c8c14f | |
| parent | a3bc536ed596708cbfb95d13a91a9849f359a37b (diff) | |
| parent | 023c69fc8a818383488ba62237b166e0b2aaf4d5 (diff) | |
Merge "AudioService: optimize BT device config change" into main
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioDeviceInventory.java | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/services/core/java/com/android/server/audio/AudioDeviceInventory.java b/services/core/java/com/android/server/audio/AudioDeviceInventory.java index 57b19cda7c12..690c37a9349a 100644 --- a/services/core/java/com/android/server/audio/AudioDeviceInventory.java +++ b/services/core/java/com/android/server/audio/AudioDeviceInventory.java @@ -914,28 +914,27 @@ public class AudioDeviceInventory { di.mDeviceCodecFormat = codec; mConnectedDevices.replace(key, di); codecChange = true; - } - final int res = mAudioSystem.handleDeviceConfigChange( - btInfo.mAudioSystemDevice, address, BtHelper.getName(btDevice), codec); - - if (res != AudioSystem.AUDIO_STATUS_OK) { - AudioService.sDeviceLogger.enqueue(new EventLogger.StringEvent( - "APM handleDeviceConfigChange failed for A2DP device addr=" - + address + " codec=" - + AudioSystem.audioFormatToString(codec)) - .printLog(TAG)); - - // force A2DP device disconnection in case of error so that AudioService - // state is consistent with audio policy manager state - setBluetoothActiveDevice(new AudioDeviceBroker.BtDeviceInfo(btInfo, - BluetoothProfile.STATE_DISCONNECTED)); - } else { - AudioService.sDeviceLogger.enqueue(new EventLogger.StringEvent( - "APM handleDeviceConfigChange success for A2DP device addr=" - + address - + " codec=" + AudioSystem.audioFormatToString(codec)) - .printLog(TAG)); - + final int res = mAudioSystem.handleDeviceConfigChange( + btInfo.mAudioSystemDevice, address, + BtHelper.getName(btDevice), codec); + if (res != AudioSystem.AUDIO_STATUS_OK) { + AudioService.sDeviceLogger.enqueue(new EventLogger.StringEvent( + "APM handleDeviceConfigChange failed for A2DP device addr=" + + address + " codec=" + + AudioSystem.audioFormatToString(codec)) + .printLog(TAG)); + + // force A2DP device disconnection in case of error so that AudioService + // state is consistent with audio policy manager state + setBluetoothActiveDevice(new AudioDeviceBroker.BtDeviceInfo(btInfo, + BluetoothProfile.STATE_DISCONNECTED)); + } else { + AudioService.sDeviceLogger.enqueue(new EventLogger.StringEvent( + "APM handleDeviceConfigChange success for A2DP device addr=" + + address + + " codec=" + AudioSystem.audioFormatToString(codec)) + .printLog(TAG)); + } } } if (!codecChange) { |