diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-10 17:46:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 17:46:37 -0700 |
| commit | d755d11e93f1281c42968ab68c6494e33d26cbe7 (patch) | |
| tree | 74f724c86f9e891811fcc31134b949ed5ca69dbd /telephony/java | |
| parent | 8775eae9416b730bfd9125dbf740154af04abc23 (diff) | |
| parent | 965d533733f0c5cd9c02813e32737b0b0ce552d0 (diff) | |
| download | frameworks_base-d755d11e93f1281c42968ab68c6494e33d26cbe7.zip frameworks_base-d755d11e93f1281c42968ab68c6494e33d26cbe7.tar.gz frameworks_base-d755d11e93f1281c42968ab68c6494e33d26cbe7.tar.bz2 | |
am 965d5337: am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)"
Merge commit '965d533733f0c5cd9c02813e32737b0b0ce552d0'
* commit '965d533733f0c5cd9c02813e32737b0b0ce552d0':
NullPointerException at handleMessage(GSMPhone.java)
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | 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 30a6324..fc03d1a 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java +++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java @@ -1204,7 +1204,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); } |