Merge "Show volume bar when BLE device's volume is changed" (b5996b0b) · Commits · e / os / android_frameworks_base

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -2817,8 +2817,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;
		}
		@@ -2958,7 +2959,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);
		@@ -3559,8 +3561,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;
		}
		@@ -3602,7 +3605,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);