Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth: Restrict gain for Absolute volume case"

Browse Source
This commit is contained in:
Eric Laurent
2016-02-03 17:30:39 +00:00
committed by Gerrit Code Review
parent 60cbd0b02b 4565a47d91
commit 81e7a58754
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -3737,8 +3737,29 @@ public class AudioService extends IAudioService.Stub {
int index; int index;
if (mIsMuted) { if (mIsMuted) {
index = 0; index = 0;
} else if (((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported) } else if ((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported) {
|| ((device & mFullVolumeDevices) != 0)) { /* 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; index = (mIndexMax + 5)/10;
} else { } else {
index = (getIndex(device) + 5)/10; index = (getIndex(device) + 5)/10;