Merge "Fix ALSA initialized wait for input-only USB Audio devices" into lmp-dev (a5e2e5e4) · Commits · e / os / android_frameworks_base

services/usb/java/com/android/server/usb/UsbHostManager.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -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);