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

Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev

Browse Source
This commit is contained in:
Paul McLean
2015-05-15 22:09:07 +00:00
committed by Android (Google) Code Review
parent 2177ed407b 34f5e04290
commit 8c501a3a56
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/com/android/internal/alsa/AlsaDevicesParser.java
View File

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