From 34f5e042904c22643f96d4466caa003073708b62 Mon Sep 17 00:00:00 2001 From: Paul McLean Date: Fri, 15 May 2015 13:57:03 -0700 Subject: [PATCH] Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java Not the cause of, but related to... Bug: 19082426 Change-Id: I296c67989debc932838b39d63fdb57396448c50c --- .../internal/alsa/AlsaDevicesParser.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/core/java/com/android/internal/alsa/AlsaDevicesParser.java b/core/java/com/android/internal/alsa/AlsaDevicesParser.java index 81b79438de209..3affd93099466 100644 --- a/core/java/com/android/internal/alsa/AlsaDevicesParser.java +++ b/core/java/com/android/internal/alsa/AlsaDevicesParser.java @@ -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: