Merge "NullPointerException at handleMessage(GSMPhone.java)"

2010-10-08 13:16:18 -07:00
parent e6ad0e477b aeab76c5be
commit 38f534882e
1 changed files with 2 additions and 1 deletions
--- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -1227,7 +1227,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);
                }