diff options
| author | Eric Laurent <elaurent@google.com> | 2014-05-30 17:09:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 17:09:04 +0000 |
| commit | c0008d1146ccdeda0a4eb08f8225225b1b1237dc (patch) | |
| tree | 93f3dc49ecedc7d5368a4616aed9f0c3ea5feb75 /services | |
| parent | 0c2cb9bcfd30856ceb83544c04f47b52e8924c52 (diff) | |
| parent | b71e58b64cd4992355cf6afaf3f3530f723bc72c (diff) | |
| download | frameworks_av-c0008d1146ccdeda0a4eb08f8225225b1b1237dc.zip frameworks_av-c0008d1146ccdeda0a4eb08f8225225b1b1237dc.tar.gz frameworks_av-c0008d1146ccdeda0a4eb08f8225225b1b1237dc.tar.bz2 | |
Merge "handle in and out audio device connection separately"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index db0f57d..7a3d2dc 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -273,15 +273,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 |