diff options
| author | Eric Laurent <elaurent@google.com> | 2015-09-14 16:17:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-14 16:17:15 +0000 |
| commit | f00b70e082c14f789c948f623daca9be7a0e36e8 (patch) | |
| tree | 25620a9e2319782e8c7d5cb7341b9846cd951941 /services | |
| parent | f5eb7c6fa2f6acb0fb19df9809d409f21e04ca4c (diff) | |
| parent | b9017af21e097ef12867e0d4b72c432579f29674 (diff) | |
| download | frameworks_av-f00b70e082c14f789c948f623daca9be7a0e36e8.zip frameworks_av-f00b70e082c14f789c948f623daca9be7a0e36e8.tar.gz frameworks_av-f00b70e082c14f789c948f623daca9be7a0e36e8.tar.bz2 | |
Merge "Force fixed volume for TTS stream" into mnc-dr-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/enginedefault/src/Gains.cpp | 8 |
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 |