summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-05-29 16:08:11 -0700
committerEric Laurent <elaurent@google.com>2014-05-29 16:08:11 -0700
commitb71e58b64cd4992355cf6afaf3f3530f723bc72c (patch)
tree5265fb32aadca2e2a3d1d83e4ba62c0ff0f83edb
parent5584c58c7c952b5ed891bbff3b00a0be3f96196d (diff)
downloadframeworks_av-b71e58b64cd4992355cf6afaf3f3530f723bc72c.zip
frameworks_av-b71e58b64cd4992355cf6afaf3f3530f723bc72c.tar.gz
frameworks_av-b71e58b64cd4992355cf6afaf3f3530f723bc72c.tar.bz2
handle in and out audio device connection separately
AudioService now indicates in and out device connection separately in case of combined devices like wired headset or BT SCO headset. Change-Id: I97adf8343d0ce32c279ffc3cce5c84ca7a349e16
-rw-r--r--services/audiopolicy/AudioPolicyManager.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp
index b047e1d..d63ad53 100644
--- a/services/audiopolicy/AudioPolicyManager.cpp
+++ b/services/audiopolicy/AudioPolicyManager.cpp
@@ -272,15 +272,7 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device,
0);
}
- if (device == AUDIO_DEVICE_OUT_WIRED_HEADSET) {
- device = AUDIO_DEVICE_IN_WIRED_HEADSET;
- } else if (device == AUDIO_DEVICE_OUT_BLUETOOTH_SCO ||
- device == AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET ||
- device == AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT) {
- device = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET;
- } else {
- return NO_ERROR;
- }
+ return NO_ERROR;
} // end if is output device
// handle input devices