diff options
4 files changed, 22 insertions, 12 deletions
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 72190e370129..676489051b4a 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -2383,6 +2383,14 @@ public class AudioSystem return types.size() == 1 && types.contains(type); } + /** + * @hide + * Return true if the audio device type is a Bluetooth LE Audio device. + */ + public static boolean isLeAudioDeviceType(int type) { + return DEVICE_OUT_ALL_BLE_SET.contains(type); + } + /** @hide */ public static final int DEFAULT_MUTE_STREAMS_AFFECTED = (1 << STREAM_MUSIC) | diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index ec8bf55f5576..31f86599b865 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -3360,8 +3360,7 @@ public class AudioService extends IAudioService.Stub dispatchAbsoluteVolumeChanged(streamType, info, newIndex); } - if ((device == AudioSystem.DEVICE_OUT_BLE_HEADSET - || device == AudioSystem.DEVICE_OUT_BLE_BROADCAST) + if (AudioSystem.isLeAudioDeviceType(device) && streamType == getBluetoothContextualVolumeStream() && (flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) { if (DEBUG_VOL) { @@ -4117,8 +4116,7 @@ public class AudioService extends IAudioService.Stub dispatchAbsoluteVolumeChanged(streamType, info, index); } - if ((device == AudioSystem.DEVICE_OUT_BLE_HEADSET - || device == AudioSystem.DEVICE_OUT_BLE_BROADCAST) + if (AudioSystem.isLeAudioDeviceType(device) && streamType == getBluetoothContextualVolumeStream() && (flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) { if (DEBUG_VOL) { @@ -6957,7 +6955,8 @@ public class AudioService extends IAudioService.Stub return AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE_MULTI_MODE; } if (isAbsoluteVolumeDevice(audioSystemDeviceOut) - || isA2dpAbsoluteVolumeDevice(audioSystemDeviceOut)) { + || isA2dpAbsoluteVolumeDevice(audioSystemDeviceOut) + || AudioSystem.isLeAudioDeviceType(audioSystemDeviceOut)) { return AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE; } return AudioManager.DEVICE_VOLUME_BEHAVIOR_VARIABLE; @@ -7724,7 +7723,9 @@ public class AudioService extends IAudioService.Stub int index; if (isFullyMuted()) { index = 0; - } else if (isAbsoluteVolumeDevice(device) || isA2dpAbsoluteVolumeDevice(device)) { + } else if (isAbsoluteVolumeDevice(device) + || isA2dpAbsoluteVolumeDevice(device) + || AudioSystem.isLeAudioDeviceType(device)) { index = getAbsoluteVolumeIndex((getIndex(device) + 5)/10); } else if (isFullVolumeDevice(device)) { index = (mIndexMax + 5)/10; @@ -7746,7 +7747,8 @@ public class AudioService extends IAudioService.Stub if (isFullyMuted()) { index = 0; } else if (isAbsoluteVolumeDevice(device) - || isA2dpAbsoluteVolumeDevice(device)) { + || isA2dpAbsoluteVolumeDevice(device) + || AudioSystem.isLeAudioDeviceType(device)) { index = getAbsoluteVolumeIndex((getIndex(device) + 5)/10); } else if (isFullVolumeDevice(device)) { index = (mIndexMax + 5)/10; @@ -8167,7 +8169,8 @@ public class AudioService extends IAudioService.Stub int streamDevice = getDeviceForStream(streamType); if ((device != streamDevice) && (isAbsoluteVolumeDevice(device) - || isA2dpAbsoluteVolumeDevice(device))) { + || isA2dpAbsoluteVolumeDevice(device) + || AudioSystem.isLeAudioDeviceType(device))) { mStreamStates[streamType].applyDeviceVolume_syncVSS(device); } mStreamStates[streamType].applyDeviceVolume_syncVSS(streamDevice); diff --git a/services/core/java/com/android/server/audio/AudioServiceEvents.java b/services/core/java/com/android/server/audio/AudioServiceEvents.java index b5835ce0c847..30a9e0a70e96 100644 --- a/services/core/java/com/android/server/audio/AudioServiceEvents.java +++ b/services/core/java/com/android/server/audio/AudioServiceEvents.java @@ -433,7 +433,7 @@ public class AudioServiceEvents { case VOL_SET_LE_AUDIO_VOL: return new StringBuilder("setLeAudioVolume:") .append(" index:").append(mVal1) - .append(" gain dB:").append(mVal2) + .append(" maxIndex:").append(mVal2) .toString(); case VOL_SET_AVRCP_VOL: return new StringBuilder("setAvrcpVolume:") diff --git a/services/core/java/com/android/server/audio/BtHelper.java b/services/core/java/com/android/server/audio/BtHelper.java index 4adbfaa79c69..6e85361e9e91 100644 --- a/services/core/java/com/android/server/audio/BtHelper.java +++ b/services/core/java/com/android/server/audio/BtHelper.java @@ -410,9 +410,8 @@ public class BtHelper { } return; } - /* leaudio expect volume value in range 0 to 255 - */ - int volume = (index * (BT_LE_AUDIO_MAX_VOL - BT_LE_AUDIO_MIN_VOL)) / maxIndex ; + /* leaudio expect volume value in range 0 to 255 */ + int volume = (int) Math.round((double) index * BT_LE_AUDIO_MAX_VOL / maxIndex); if (AudioService.DEBUG_VOL) { Log.i(TAG, "setLeAudioVolume: calling mLeAudio.setVolume idx=" |