summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhihai Xu <zhihaixu@google.com>2014-03-12 23:25:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-12 23:25:11 +0000
commitbdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7 (patch)
tree27b617a2a4375995cc8eb38cca4fa5e2d78d689b
parentdb3146c039750f68418e0908037a8bed3890913c (diff)
parent60d7c9957891280dfb131d5d58f32cf6fb82d5a2 (diff)
downloadframeworks_base-bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7.zip
frameworks_base-bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7.tar.gz
frameworks_base-bdd4c31a22b9a5395e9d727e9f39ce1dc689c0a7.tar.bz2
am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '60d7c9957891280dfb131d5d58f32cf6fb82d5a2': DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
-rw-r--r--media/java/android/media/AudioService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java
index b836f50..17c4595 100644
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -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);
}
}
}