Commit 6d3d6c4a authored Mar 14, 2014 by Zhihai Xu Committed by Android Git Automerger Mar 14, 2014

am 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE...

am 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev

* commit '57080be9':
  DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager

parents 63938750 57080be9

media/java/android/media/AudioService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1019,7 +1019,7 @@ public class AudioService extends IAudioService.Stub {
		(flags & AudioManager.FLAG_BLUETOOTH_ABS_VOLUME) == 0) {
		synchronized (mA2dpAvrcpLock) {
		if (mA2dp != null && mAvrcpAbsVolSupported) {
		mA2dp.setAvrcpAbsoluteVolume(index);
		mA2dp.setAvrcpAbsoluteVolume(index / 10);
		}
		}
		}