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

Commit 965d5337 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 38f53488: Merge "NullPointerException at handleMessage(GSMPhone.java)" 

Merge commit '38f53488' into gingerbread-plus-aosp

* commit '38f53488':
  NullPointerException at handleMessage(GSMPhone.java)
parents b323559b 38f53488

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

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

                }