Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show volume bar when BLE device's volume is changed" am: b5996b0b46 am: 964c01620b am: 7be02970fa

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

Change-Id: I424a72541bd64a3a7d635f663f745cc9f4034128
This commit is contained in:
Hyundo Moon
2022-02-11 02:45:47 +00:00
committed by Automerger Merge Worker
parent 7dceeeda41 7be02970fa
commit b317fc17b7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -2857,8 +2857,9 @@ public class AudioService extends IAudioService.Stub
int step;
// skip a2dp absolute volume control request when the device
// is not an a2dp device
if (!AudioSystem.DEVICE_OUT_ALL_A2DP_SET.contains(device)
// is neither an a2dp device nor BLE device
if ((!AudioSystem.DEVICE_OUT_ALL_A2DP_SET.contains(device)
&& !AudioSystem.DEVICE_OUT_ALL_BLE_SET.contains(device))
&& (flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) != 0) {
return;
}
@@ -2998,7 +2999,8 @@ public class AudioService extends IAudioService.Stub
}
if (device == AudioSystem.DEVICE_OUT_BLE_HEADSET
&& streamType == getBluetoothContextualVolumeStream()) {
&& streamType == getBluetoothContextualVolumeStream()
&& (flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) {
if (DEBUG_VOL) {
Log.d(TAG, "adjustSreamVolume postSetLeAudioVolumeIndex index="
+ newIndex + " stream=" + streamType);
@@ -3599,8 +3601,9 @@ public class AudioService extends IAudioService.Stub
int oldIndex;
// skip a2dp absolute volume control request when the device
// is not an a2dp device
if (!AudioSystem.DEVICE_OUT_ALL_A2DP_SET.contains(device)
// is neither an a2dp device nor BLE device
if ((!AudioSystem.DEVICE_OUT_ALL_A2DP_SET.contains(device)
&& !AudioSystem.DEVICE_OUT_ALL_BLE_SET.contains(device))
&& (flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) != 0) {
return;
}
@@ -3642,7 +3645,8 @@ public class AudioService extends IAudioService.Stub
}
if (device == AudioSystem.DEVICE_OUT_BLE_HEADSET
&& streamType == getBluetoothContextualVolumeStream()) {
&& streamType == getBluetoothContextualVolumeStream()
&& (flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) {
if (DEBUG_VOL) {
Log.d(TAG, "adjustSreamVolume postSetLeAudioVolumeIndex index="
+ index + " stream=" + streamType);