diff options
author | Steve Kondik <shade@chemlab.org> | 2010-11-30 16:43:54 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2010-11-30 16:43:54 +0000 |
commit | c473a7efe6dd6bb8547be9a4a58d2aeaa0f3b94b (patch) | |
tree | 5ec0a340f4d9dd6f4c7849ac682c79e91e913aa3 | |
parent | bb62fea5a8ffdb2d5a92b41f15ad08ebc6a2eb74 (diff) | |
parent | f93d3f268afaa75b8b13282b130d258bae4ddcb0 (diff) | |
download | frameworks_base-c473a7efe6dd6bb8547be9a4a58d2aeaa0f3b94b.zip frameworks_base-c473a7efe6dd6bb8547be9a4a58d2aeaa0f3b94b.tar.gz frameworks_base-c473a7efe6dd6bb8547be9a4a58d2aeaa0f3b94b.tar.bz2 |
Merge "NullPointerException at handleMessage(GSMPhone.java)" into froyo
-rwxr-xr-x | telephony/java/com/android/internal/telephony/gsm/GSMPhone.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java index 2bb7968..3d22441 100755 --- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java +++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java @@ -1219,7 +1219,8 @@ public class GSMPhone extends PhoneBase { // Check if this is a different SIM than the previous one. If so unset the // voice mail number. String imsi = getVmSimImsi(); - if (imsi != null && !getSubscriberId().equals(imsi)) { + String imsiFromSIM = getSubscriberId(); + if (imsi != null && imsiFromSIM != null && !imsiFromSIM.equals(imsi)) { storeVoiceMailNumber(null); setVmSimImsi(null); } |