Merge "AudioManager: Use setAvrcpAbsoluteVolume in adjustStreamVolume" am:... (eaf5a4a1) · Commits · e / os / android_frameworks_base

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

+13 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1538,17 +1538,6 @@ public class AudioService extends IAudioService.Stub
	if (adjustVolume && (direction != AudioManager.ADJUST_SAME)) {		if (adjustVolume && (direction != AudioManager.ADJUST_SAME)) {
	mAudioHandler.removeMessages(MSG_UNMUTE_STREAM);		mAudioHandler.removeMessages(MSG_UNMUTE_STREAM);

	// Check if volume update should be send to AVRCP
	if (streamTypeAlias == AudioSystem.STREAM_MUSIC &&
	(device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 &&
	(flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) {
	synchronized (mA2dpAvrcpLock) {
	if (mA2dp != null && mAvrcpAbsVolSupported) {
	mA2dp.adjustAvrcpAbsoluteVolume(direction);
	}
	}
	}

	if (isMuteAdjust) {		if (isMuteAdjust) {
	boolean state;		boolean state;
	if (direction == AudioManager.ADJUST_TOGGLE_MUTE) {		if (direction == AudioManager.ADJUST_TOGGLE_MUTE) {
	@@ -1597,8 +1586,20 @@ public class AudioService extends IAudioService.Stub
	0);		0);
	}		}

	// Check if volume update should be sent to Hdmi system audio.
	int newIndex = mStreamStates[streamType].getIndex(device);		int newIndex = mStreamStates[streamType].getIndex(device);

			// Check if volume update should be send to AVRCP
			if (streamTypeAlias == AudioSystem.STREAM_MUSIC &&
			(device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 &&
			(flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) {
			synchronized (mA2dpAvrcpLock) {
			if (mA2dp != null && mAvrcpAbsVolSupported) {
			mA2dp.setAvrcpAbsoluteVolume(newIndex / 10);
			}
			}
			}

			// Check if volume update should be sent to Hdmi system audio.
	if (streamTypeAlias == AudioSystem.STREAM_MUSIC) {		if (streamTypeAlias == AudioSystem.STREAM_MUSIC) {
	setSystemAudioVolume(oldIndex, newIndex, getStreamMaxVolume(streamType), flags);		setSystemAudioVolume(oldIndex, newIndex, getStreamMaxVolume(streamType), flags);
	}		}