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

Commit 38f53488 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "NullPointerException at handleMessage(GSMPhone.java)"

parents e6ad0e47 aeab76c5

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

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

                }