diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-08-13 08:04:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-13 08:04:47 -0700 |
| commit | 249a65a3a132ff136a7a529f1cf4a13afde9a272 (patch) | |
| tree | 0518b83fcee85df558dc061c0289ffd6a75f6bc2 | |
| parent | 972fb8879c46f774daec656b3b1c1f070f04ee3e (diff) | |
| parent | 043a9e2917fc9f4359b92b01b010080368e0861e (diff) | |
| download | msm7k-249a65a3a132ff136a7a529f1cf4a13afde9a272.tar.gz | |
Merge "In the car dock, when playing media through the 3.5mm jack, ensure a minimum volume is used, not a fixed volume." into gingerbread
| -rw-r--r-- | libaudio-qsd8k/AudioPolicyManager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libaudio-qsd8k/AudioPolicyManager.cpp b/libaudio-qsd8k/AudioPolicyManager.cpp index 51d6a93..2328847 100644 --- a/libaudio-qsd8k/AudioPolicyManager.cpp +++ b/libaudio-qsd8k/AudioPolicyManager.cpp @@ -262,9 +262,10 @@ float AudioPolicyManager::computeVolume(int stream, int index, audio_io_handle_t } } - // in car dock: when using the 3.5mm jack to play media, set a fixed volume as access to the + // in car dock: when using the 3.5mm jack to play media, set a minimum volume as access to the // physical volume keys is blocked by the car dock frame. if ((mForceUse[AudioSystem::FOR_DOCK] == AudioSystem::FORCE_BT_CAR_DOCK) && + (volume < CAR_DOCK_MUSIC_MINI_JACK_VOLUME_MIN) && (stream == AudioSystem::MUSIC) && (device & (AudioSystem::DEVICE_OUT_WIRED_HEADPHONE | AudioSystem::DEVICE_OUT_WIRED_HEADSET))) { |