summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-07-25 12:17:46 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-07-25 12:17:46 -0700
commit801aa9f327730327132aafbae7e0c55bb6e7ea71 (patch)
treed9e4148124158dc96fd170e6f3ff9921db6df216 /src
parentec1ecc09ac9339e00fe6fc283397d3afd6c07d9a (diff)
parent7c491bb3d140e2579c2c01edca94305701664db5 (diff)
downloadframeworks_opt_telephony-801aa9f327730327132aafbae7e0c55bb6e7ea71.zip
frameworks_opt_telephony-801aa9f327730327132aafbae7e0c55bb6e7ea71.tar.gz
frameworks_opt_telephony-801aa9f327730327132aafbae7e0c55bb6e7ea71.tar.bz2
Merge "Fix PhoneApp crash while decoding operatorNumeric to find mcc"
Diffstat (limited to 'src')
-rw-r--r--src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
index 56cf53a..808ec2b 100644
--- a/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
@@ -864,8 +864,9 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
mNitzUpdatedTime = false;
} else {
String iso = "";
- String mcc = operatorNumeric.substring(0, 3);
+ String mcc = "";
try{
+ mcc = operatorNumeric.substring(0, 3);
iso = MccTable.countryCodeForMcc(Integer.parseInt(mcc));
} catch ( NumberFormatException ex){
loge("pollStateDone: countryCodeForMcc error" + ex);