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

am 0844dcd0: Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev

Browse Source 
* commit '0844dcd07034699f3edb0bab4a2ddfc97cc9a25c':
  Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"
This commit is contained in:
Paul Mclean
2015-05-15 22:33:45 +00:00
committed by Android Git Automerger
parent b50a8b97da 0844dcd070
commit bb2387bd3f
1 changed files with 4 additions and 14 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,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: