summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Laurent <elaurent@google.com> 2015-10-29 17:52:48 -0700
committer Andre Eisenbach <|account-1012871@pbcma10.prod.google.com> 2015-10-30 16:12:45 +0000
commite4381ec97c67fad16acfcc9933fde04f2260d796 (patch)
tree126801f4315e5c1470f9ddea6bb429c992b1a16b
parentf789ef7e381ea57a4f515fde470d40f93bc5f345 (diff)
AudioService: fix BT SCO min volume
Set minimum BT SCO stream volume back to 0 to comply to Bluetooth audio gateway requirement. Also fix minimum stream volume when initializing audio policy manager after a mediaserver crash. Bug: 24747886 Change-Id: I80c51114d5b10a132b7b10f216bce96323fdc166
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java5
1 files changed, 3 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 246ff081177d..66e731a29dde 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -280,7 +280,7 @@ public class AudioService extends IAudioService.Stub {
0, // STREAM_MUSIC
0, // STREAM_ALARM
0, // STREAM_NOTIFICATION
- 1, // STREAM_BLUETOOTH_SCO
+ 0, // STREAM_BLUETOOTH_SCO
0, // STREAM_SYSTEM_ENFORCED
0, // STREAM_DTMF
0 // STREAM_TTS
@@ -803,7 +803,8 @@ public class AudioService extends IAudioService.Stub {
int numStreamTypes = AudioSystem.getNumStreamTypes();
for (int streamType = numStreamTypes - 1; streamType >= 0; streamType--) {
VolumeStreamState streamState = mStreamStates[streamType];
- AudioSystem.initStreamVolume(streamType, 0, (streamState.mIndexMax + 5) / 10);
+ AudioSystem.initStreamVolume(
+ streamType, streamState.mIndexMin / 10, streamState.mIndexMax / 10);
streamState.applyAllVolumes();
}