summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAddison Nuding <addison@google.com>2016-03-01 04:55:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-01 04:55:21 +0000
commit90971655df72d88a3f2ec1c1bd2c9bdb59454f2d (patch)
tree9cafc3a4d4d3870b1cad3984bfafbdae7bbaa2a2
parent9cad16a89f6c0bdeae44b057522768439a8a2caa (diff)
parent18b2c683dffb2cc5871642e810d0567f3ad85a2e (diff)
downloadbase-90971655df72d88a3f2ec1c1bd2c9bdb59454f2d.tar.gz
Merge "DO NOT MERGE Bluetooth: Restrict gain for Absolute volume case" into mnc-dr-ryu-dev
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java25
1 files changed, 23 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 152ff303c1e7..0f957dba225f 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -3737,8 +3737,29 @@ public class AudioService extends IAudioService.Stub {
int index;
if (mIsMuted) {
index = 0;
- } else if (((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported)
- || ((device & mFullVolumeDevices) != 0)) {
+ } else if ((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported) {
+ /* Special handling for Bluetooth Absolute Volume scenario
+ * If we send full audio gain, some accessories are too loud even at its lowest
+ * volume. We are not able to enumerate all such accessories, so here is the
+ * workaround from phone side.
+ * For the lowest volume steps 1 and 2, restrict audio gain to 50% and 75%.
+ * For volume step 0, set audio gain to 0 as some accessories won't mute on their end.
+ */
+ int i = (getIndex(device) + 5)/10;
+ if (i == 0) {
+ // 0% for volume 0
+ index = 0;
+ } else if (i == 1) {
+ // 50% for volume 1
+ index = (int)(mIndexMax * 0.5) /10;
+ } else if (i == 2) {
+ // 75% for volume 2
+ index = (int)(mIndexMax * 0.75) /10;
+ } else {
+ // otherwise, full gain
+ index = (mIndexMax + 5)/10;
+ }
+ } else if ((device & mFullVolumeDevices) != 0) {
index = (mIndexMax + 5)/10;
} else {
index = (getIndex(device) + 5)/10;