Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46f7c233 authored by Paul McLean's avatar Paul McLean Committed by Android Git Automerger
Browse files

am 8c501a3a: Merge "Addeding try/catch to card#/device# parsing in... 

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

* commit '8c501a3a':
  Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java
parents e12fe8cd 8c501a3a

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

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



                    case kToken_CardNum:

                        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:

                        try {

                            mDeviceNum = Integer.parseInt(token);

                        } catch (NumberFormatException e) {

                            Slog.e(TAG, "Failed to parse device number: " token);

                            return false;

                        }

                        break;



                    case kToken_Type0: