diff options
| author | Eric Laurent <elaurent@google.com> | 2010-10-29 08:20:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-29 08:20:05 -0700 |
| commit | 91311f956e54b767510659b9294c643b7c260c55 (patch) | |
| tree | f54c1cfadd5dbd51c1006719760322246dfa7b18 | |
| parent | 6f6b4b39c1f97e1a3fd9a70e32600ca035cf130e (diff) | |
| parent | 39408b416067cf102c5a3029a701f16fe5a6778b (diff) | |
| download | device_samsung_crespo-91311f956e54b767510659b9294c643b7c260c55.zip device_samsung_crespo-91311f956e54b767510659b9294c643b7c260c55.tar.gz device_samsung_crespo-91311f956e54b767510659b9294c643b7c260c55.tar.bz2 | |
am 39408b41: am 0df59c73: Merge "S5PC11X: SOUND: changed IPC type of audio path for wired-headset with no mic." into gingerbread
* commit '39408b416067cf102c5a3029a701f16fe5a6778b':
S5PC11X: SOUND: changed IPC type of audio path for wired-headset with no mic.
| -rw-r--r-- | libaudio2/AudioHardware.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libaudio2/AudioHardware.cpp b/libaudio2/AudioHardware.cpp index 2a25b53..0eee17a 100644 --- a/libaudio2/AudioHardware.cpp +++ b/libaudio2/AudioHardware.cpp @@ -601,6 +601,7 @@ status_t AudioHardware::setIncallPath_l(uint32_t device) break; case AudioSystem::DEVICE_OUT_SPEAKER: + case AudioSystem::DEVICE_OUT_WIRED_HEADPHONE : LOGI("### incall mode speaker route"); path = SOUND_AUDIO_PATH_SPEAKER; break; @@ -617,7 +618,6 @@ status_t AudioHardware::setIncallPath_l(uint32_t device) break; case AudioSystem::DEVICE_OUT_WIRED_HEADSET : - case AudioSystem::DEVICE_OUT_WIRED_HEADPHONE : LOGI("### incall mode headset route"); path = SOUND_AUDIO_PATH_HEADSET; break; |