diff options
| author | Eric Laurent <elaurent@google.com> | 2014-05-30 17:09:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-30 17:09:19 +0000 |
| commit | f466bfe146aa7fb22a687acc264eebe96e19e39b (patch) | |
| tree | c250beced8f949a7b273681fef88ac8948c0b2f9 | |
| parent | e1edbe6c1114d6e2347f9768617fd19c58c4ff85 (diff) | |
| parent | 806fab660adf8a5c3d36e9411d214a4942cd67e9 (diff) | |
| download | hardware_libhardware_legacy-f466bfe146aa7fb22a687acc264eebe96e19e39b.zip hardware_libhardware_legacy-f466bfe146aa7fb22a687acc264eebe96e19e39b.tar.gz hardware_libhardware_legacy-f466bfe146aa7fb22a687acc264eebe96e19e39b.tar.bz2 | |
Merge "handle in and out audio device connection separately"
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 461c47a..f6ac571 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -184,15 +184,7 @@ status_t AudioPolicyManagerBase::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 |