diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-07-01 00:36:12 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-07-02 10:55:01 -0700 |
| commit | a80e16fa05b4b5e04b7b96453a6f3e4d0ea3cbb9 (patch) | |
| tree | 3498fe0ac7c76ee0765621383f577fb75cf9eb76 /src/java/com | |
| parent | 44396d8e77244233e0673551e495dee4b2b0a2ac (diff) | |
| download | android_frameworks_opt_telephony-a80e16fa05b4b5e04b7b96453a6f3e4d0ea3cbb9.tar.gz android_frameworks_opt_telephony-a80e16fa05b4b5e04b7b96453a6f3e4d0ea3cbb9.tar.bz2 android_frameworks_opt_telephony-a80e16fa05b4b5e04b7b96453a6f3e4d0ea3cbb9.zip | |
gsmsst: Protect against "null" string literals
* Yes, this happens.
Change-Id: I81a5e1404f530bcdab2f3f44f30bbe489ccf9849
Diffstat (limited to 'src/java/com')
| -rw-r--r-- | src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java index 9af0ac58d..6bb5cfaf2 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java @@ -837,14 +837,17 @@ public class GsmServiceStateTracker extends ServiceStateTracker { regState = Integer.parseInt(states[0]); // states[3] (if present) is the current radio technology - if (states.length >= 4 && states[3] != null) { + if (states.length >= 4 && states[3] != null && + !"null".equals(states[3])) { type = Integer.parseInt(states[3]); } if ((states.length >= 5 ) && - (regState == ServiceState.RIL_REG_STATE_DENIED)) { + (regState == ServiceState.RIL_REG_STATE_DENIED) && + !"null".equals(states[4])) { mNewReasonDataDenied = Integer.parseInt(states[4]); } - if (states.length >= 6) { + if (states.length >= 6 && states[5] != null && + !"null".equals(states[5])) { mNewMaxDataCalls = Integer.parseInt(states[5]); } } catch (NumberFormatException ex) { |