summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Glenn Kasten <gkasten@android.com> 2015-11-04 16:10:44 +0000
committer android-build-merger <android-build-merger@google.com> 2015-11-04 16:10:44 +0000
commit110418030167702f29fa686616d68fc62f9c0995 (patch)
tree363272a2281e48d127223d1a84c39d02777b2021
parent2e8c3c11b7f482f01b1ff76a6217eaf129253809 (diff)
parentebbdabdb826c083769e7d7bc102a59a04c9e0329 (diff)
Merge "Built-in mic is not used when USB mic is disconnected"
am: ebbdabdb82 * commit 'ebbdabdb826c083769e7d7bc102a59a04c9e0329': Built-in mic is not used when USB mic is disconnected
-rw-r--r--services/usb/java/com/android/server/usb/UsbAlsaManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbAlsaManager.java b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
index 31763e7a90ba..701272e28630 100644
--- a/services/usb/java/com/android/server/usb/UsbAlsaManager.java
+++ b/services/usb/java/com/android/server/usb/UsbAlsaManager.java
@@ -439,7 +439,7 @@ public final class UsbAlsaManager {
UsbAudioDevice audioDevice = mAudioDevices.remove(usbDevice);
if (audioDevice != null) {
- if (audioDevice.mHasPlayback || audioDevice.mHasPlayback) {
+ if (audioDevice.mHasPlayback || audioDevice.mHasCapture) {
notifyDeviceState(audioDevice, false);
// if there any external devices left, select one of them