diff options
| author | Eric Laurent <elaurent@google.com> | 2010-10-21 11:49:45 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2010-10-22 17:39:32 -0700 |
| commit | 5f3ccdc426ae00d6caacc33810d373ac2f1a4d50 (patch) | |
| tree | 7c41841ca3113b2d947fa2deb83f89b9a908a9f0 /libaudio | |
| parent | 98447ec76f11e15025991d367e48ea052756245e (diff) | |
| download | device_samsung_crespo-5f3ccdc426ae00d6caacc33810d373ac2f1a4d50.zip device_samsung_crespo-5f3ccdc426ae00d6caacc33810d373ac2f1a4d50.tar.gz device_samsung_crespo-5f3ccdc426ae00d6caacc33810d373ac2f1a4d50.tar.bz2 | |
Fix issue 3119463.
There is no call audio uplink when headphones w/o mic are connected.
This change together with a corresponding change in the kernel driver adds
a separate device for headphonjes without mic: output is routed to headphones
and input is routed from built-in mic.
Change-Id: I19955f76ece19f661ae25d6a42bbcbe235a9e652
Diffstat (limited to 'libaudio')
| -rwxr-xr-x | libaudio/AudioHardwareALSA.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libaudio/AudioHardwareALSA.cpp b/libaudio/AudioHardwareALSA.cpp index db2a767..45223f3 100755 --- a/libaudio/AudioHardwareALSA.cpp +++ b/libaudio/AudioHardwareALSA.cpp @@ -118,7 +118,7 @@ static const char *deviceSuffix[] = { /* ROUTE_EARPIECE */ "_Earpiece", /* ROUTE_SPEAKER */ "_Speaker", /* ROUTE_HEADSET */ "_Headset", - /* ROUTE_HEADPHONE */ "_Headset", + /* ROUTE_HEADPHONE */ "_Headphone", /* ROUTE_BLUETOOTH_SCO */ "_Bluetooth", /* ROUTE_BLUETOOTH_SCO_HEADSET */ "_Bluetooth", /* ROUTE_BLUETOOTH_SCO_CARKIT */ "_Bluetooth", //"_Bluetooth_Carkit" @@ -333,7 +333,6 @@ status_t AudioHardwareALSA::setVoiceVolume(float volume) LOGI("### route(%d) call volume(%f)", routes, volume); switch (routes) { case AudioSystem::ROUTE_EARPIECE: - case AudioSystem::ROUTE_HEADPHONE: // Use receive path with 3 pole headset. LOGI("### earpiece call volume"); setCallVolume(mRilClient, SOUND_TYPE_VOICE, int_volume); break; @@ -352,6 +351,7 @@ status_t AudioHardwareALSA::setVoiceVolume(float volume) break; case AudioSystem::ROUTE_HEADSET: + case AudioSystem::ROUTE_HEADPHONE: // Use receive path with 3 pole headset. LOGI("### headset call volume"); setCallVolume(mRilClient, SOUND_TYPE_HEADSET, int_volume); break; |