Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c473a7ef authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "NullPointerException at handleMessage(GSMPhone.java)" into froyo

parents bb62fea5 f93d3f26

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

                }