Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NullPointerException at handleMessage(GSMPhone.java)"

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2010-10-08 13:16:18 -07:00
committed by Android Code Review
parent e6ad0e477b aeab76c5be
commit 38f534882e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
View File

@@ -1227,7 +1227,8 @@ public class GSMPhone extends PhoneBase {
// Check if this is a different SIM than the previous one. If so unset the // Check if this is a different SIM than the previous one. If so unset the
// voice mail number. // voice mail number.
String imsi = getVmSimImsi(); String imsi = getVmSimImsi();
if (imsi != null && !getSubscriberId().equals(imsi)) { String imsiFromSIM = getSubscriberId();
if (imsi != null && imsiFromSIM != null && !imsiFromSIM.equals(imsi)) {
storeVoiceMailNumber(null); storeVoiceMailNumber(null);
setVmSimImsi(null); setVmSimImsi(null);
} }