summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorZhihai Xu <zhihaixu@google.com>2014-03-14 16:01:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 16:01:00 +0000
commit6d3d6c4a06a1e83d126622d8a971f439b80ec354 (patch)
tree9aaa047d94df289cd8c66d4eee8c690692afd559 /media
parent6393875024e3b2ee6916d718d79dfbeb722537c1 (diff)
parent57080be98e6c8d33781c619b79731264ab909baf (diff)
downloadframeworks_base-6d3d6c4a06a1e83d126622d8a971f439b80ec354.zip
frameworks_base-6d3d6c4a06a1e83d126622d8a971f439b80ec354.tar.gz
frameworks_base-6d3d6c4a06a1e83d126622d8a971f439b80ec354.tar.bz2
am 57080be9: am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev
* commit '57080be98e6c8d33781c619b79731264ab909baf': DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager
Diffstat (limited to 'media')
-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);
}
}
}