summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-09-10 18:38:08 -0700
committerEric Laurent <elaurent@google.com>2015-09-11 14:30:52 -0700
commitb9017af21e097ef12867e0d4b72c432579f29674 (patch)
treea9283a1f2a1846508e6eeb8579b166ddc85d21ed /services/audiopolicy
parent0f05031545e43c8fe49a9dda0cfd9dce202d1ef3 (diff)
downloadframeworks_av-b9017af21e097ef12867e0d4b72c432579f29674.zip
frameworks_av-b9017af21e097ef12867e0d4b72c432579f29674.tar.gz
frameworks_av-b9017af21e097ef12867e0d4b72c432579f29674.tar.bz2
Force fixed volume for TTS stream
Always play Transmitted Through Speaker stream at max volume instead of tracking media stream volume. Bug: 23729461. Change-Id: I61021f59617bb851a4cd7da80924e587029e96a3
Diffstat (limited to 'services/audiopolicy')
-rw-r--r--services/audiopolicy/enginedefault/src/Gains.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/audiopolicy/enginedefault/src/Gains.cpp b/services/audiopolicy/enginedefault/src/Gains.cpp
index 78f2909..d06365c 100644
--- a/services/audiopolicy/enginedefault/src/Gains.cpp
+++ b/services/audiopolicy/enginedefault/src/Gains.cpp
@@ -171,10 +171,10 @@ const VolumeCurvePoint *Gains::sVolumeProfiles[AUDIO_STREAM_CNT]
},
{ // AUDIO_STREAM_TTS
// "Transmitted Through Speaker": always silent except on DEVICE_CATEGORY_SPEAKER
- Gains::sSilentVolumeCurve, // DEVICE_CATEGORY_HEADSET
- Gains::sLinearVolumeCurve, // DEVICE_CATEGORY_SPEAKER
- Gains::sSilentVolumeCurve, // DEVICE_CATEGORY_EARPIECE
- Gains::sSilentVolumeCurve // DEVICE_CATEGORY_EXT_MEDIA
+ Gains::sSilentVolumeCurve, // DEVICE_CATEGORY_HEADSET
+ Gains::sFullScaleVolumeCurve, // DEVICE_CATEGORY_SPEAKER
+ Gains::sSilentVolumeCurve, // DEVICE_CATEGORY_EARPIECE
+ Gains::sSilentVolumeCurve // DEVICE_CATEGORY_EXT_MEDIA
},
{ // AUDIO_STREAM_ACCESSIBILITY
Gains::sDefaultMediaVolumeCurve, // DEVICE_CATEGORY_HEADSET