summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-06-07 16:34:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-07 16:34:37 -0700
commit4168c3a339d8a6d571dcbceca65b9936da1c5e55 (patch)
treea9805e943427f9af96b3611ddff4d2dbfa4cca0e
parentfc6e3fe41473c76bcc1efc70bcc241b943988343 (diff)
parente3ce4e99970bd2820f91345b769e6f57353e02f0 (diff)
downloadhardware_libhardware_legacy-4168c3a339d8a6d571dcbceca65b9936da1c5e55.zip
hardware_libhardware_legacy-4168c3a339d8a6d571dcbceca65b9936da1c5e55.tar.gz
hardware_libhardware_legacy-4168c3a339d8a6d571dcbceca65b9936da1c5e55.tar.bz2
am e3ce4e99: Merge "Increase system stream volume on speaker" into jb-dev
* commit 'e3ce4e99970bd2820f91345b769e6f57353e02f0': Increase system stream volume on speaker
-rw-r--r--audio/AudioPolicyManagerBase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index ee758b3..aaae2c2 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -2523,10 +2523,10 @@ const AudioPolicyManagerBase::VolumeCurvePoint
// AUDIO_STREAM_SYSTEM, AUDIO_STREAM_ENFORCED_AUDIBLE and AUDIO_STREAM_DTMF volume tracks
// AUDIO_STREAM_RING on phones and AUDIO_STREAM_MUSIC on tablets (See AudioService.java).
-// The range is constrained between -30dB and -12dB over speaker and -30dB and -18dB over headset.
+// The range is constrained between -24dB and -6dB over speaker and -30dB and -18dB over headset.
const AudioPolicyManagerBase::VolumeCurvePoint
AudioPolicyManagerBase::sDefaultSystemVolumeCurve[AudioPolicyManagerBase::VOLCNT] = {
- {1, -30.0f}, {33, -24.0f}, {66, -18.0f}, {100, -12.0f}
+ {1, -24.0f}, {33, -18.0f}, {66, -12.0f}, {100, -6.0f}
};
const AudioPolicyManagerBase::VolumeCurvePoint