Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ALSA initialized wait for input-only USB Audio devices" into lmp-dev

Browse Source
This commit is contained in:
Paul McLean
2014-08-14 20:13:07 +00:00
committed by Android (Google) Code Review
parent 21dbab14f4 c7f084f61c
commit a5e2e5e48a
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/usb/java/com/android/server/usb/UsbHostManager.java
View File

@@ -314,14 +314,22 @@ public class UsbHostManager {
mConnectedUsbCard = cardsParser.getNumCardRecords() - 1;
mConnectedUsbDeviceNum = 0;
if (!waitForAlsaFile(mConnectedUsbCard, mConnectedUsbDeviceNum, false)) {
return;
}
mConnectedHasPlayback = devicesParser.hasPlaybackDevices(mConnectedUsbCard);
mConnectedHasCapture = devicesParser.hasCaptureDevices(mConnectedUsbCard);
mConnectedHasMIDI = devicesParser.hasMIDIDevices(mConnectedUsbCard);
// Playback device file needed/present?
if (mConnectedHasPlayback &&
!waitForAlsaFile(mConnectedUsbCard, mConnectedUsbDeviceNum, false)) {
return;
}
// Capture device file needed/present?
if (mConnectedHasCapture &&
!waitForAlsaFile(mConnectedUsbCard, mConnectedUsbDeviceNum, true)) {
return;
}
if (DEBUG_AUDIO) {
Slog.d(TAG,
"usb: hasPlayback:" + mConnectedHasPlayback + " hasCapture:" + mConnectedHasCapture);