summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-10-28 19:43:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-28 19:43:40 -0700
commit0df59c73f074050842b412aa2876ca203d7b5ed3 (patch)
tree9dd22da6efc7d00850a8be341af16d11ab2bb43d
parent802890e7ab775d71f9ff11a1b259778cd6b90917 (diff)
parent03ad5f40754ed3db71755e6d01c34bd6260e42a5 (diff)
downloaddevice_samsung_crespo-0df59c73f074050842b412aa2876ca203d7b5ed3.zip
device_samsung_crespo-0df59c73f074050842b412aa2876ca203d7b5ed3.tar.gz
device_samsung_crespo-0df59c73f074050842b412aa2876ca203d7b5ed3.tar.bz2
Merge "S5PC11X: SOUND: changed IPC type of audio path for wired-headset with no mic." into gingerbread
-rw-r--r--libaudio2/AudioHardware.cpp2
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;