Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev (0844dcd0) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/alsa/AlsaDevicesParser.java

+4 −14

Original line number	Original line	Diff line number	Diff line
	@@ -98,24 +98,14 @@ public class AlsaDevicesParser {
	break;		break;

	case kToken_CardNum:		case kToken_CardNum:
	try {
	mCardNum = Integer.parseInt(token);		mCardNum = Integer.parseInt(token);
	if (line.charAt(delimOffset) != '-') {		if (line.charAt(delimOffset) != '-') {
	tokenIndex++; // no device # in the token stream		tokenIndex++; // no device # in the token stream
	}		}
	} catch (NumberFormatException e) {
	Slog.e(TAG, "Failed to parse card number: " token);
	return false;
	}
	break;		break;

	case kToken_DeviceNum:		case kToken_DeviceNum:
	try {
	mDeviceNum = Integer.parseInt(token);		mDeviceNum = Integer.parseInt(token);
	} catch (NumberFormatException e) {
	Slog.e(TAG, "Failed to parse device number: " token);
	return false;
	}
	break;		break;

	case kToken_Type0:		case kToken_Type0: