From aeab76c5be62ad4289e5b27937affd4460d588b3 Mon Sep 17 00:00:00 2001 From: Babis Triantafyllou Date: Fri, 8 Oct 2010 16:02:11 +0200 Subject: [PATCH] NullPointerException at handleMessage(GSMPhone.java) NullPointerException at com.android.internal.telephony.gsm.GSMPhone.handleMessage(GSMPhone.java) Failing to retrieved the IMSI number from SIM card could lead to an exception. A null pointer check will prevent this. Change-Id: I26760543484504c8d35215bfb1e8f1ae664aeade --- .../java/com/android/internal/telephony/gsm/GSMPhone.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java index 6665632871078..49de5f912e684 100644 --- 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); }