diff options
| author | Shareef Ali <shareefalis@cyanogenmod.org> | 2013-07-29 22:15:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-29 22:15:02 +0000 |
| commit | 9b879a13a6270df597e588b46ef0237677ef47b3 (patch) | |
| tree | 0e50c7f90c8c8994e2ce303c0cf1f0644a0e453e /src | |
| parent | 61aa925f47e4d0970739855236d91b2491f76ece (diff) | |
| parent | 94987a5fa375195f25afe13c24ff1a6f04143bc8 (diff) | |
| download | frameworks_opt_telephony-9b879a13a6270df597e588b46ef0237677ef47b3.zip frameworks_opt_telephony-9b879a13a6270df597e588b46ef0237677ef47b3.tar.gz frameworks_opt_telephony-9b879a13a6270df597e588b46ef0237677ef47b3.tar.bz2 | |
Merge "Revert "SamsungQualcommRIL: always convert hex to int."" into cm-10.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/com/android/internal/telephony/SamsungQualcommRIL.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/SamsungQualcommRIL.java b/src/java/com/android/internal/telephony/SamsungQualcommRIL.java index 5dacea1..1d9f0c2 100644 --- a/src/java/com/android/internal/telephony/SamsungQualcommRIL.java +++ b/src/java/com/android/internal/telephony/SamsungQualcommRIL.java @@ -536,7 +536,11 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface { if (response[i]== null){ response[i]=Integer.toString(Integer.MAX_VALUE); } else { - response[i]=Integer.toString(Integer.parseInt(response[i],16)); + try { + Integer.parseInt(response[i]); + } catch(NumberFormatException e) { + response[i]=Integer.toString(Integer.parseInt(response[i],16)); + } } } } |