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

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

Browse Source 
Merge commit '38f534882eb9214b4c1a8035990157f941762f85' into gingerbread-plus-aosp

* commit '38f534882eb9214b4c1a8035990157f941762f85':
  NullPointerException at handleMessage(GSMPhone.java)
This commit is contained in:
Jean-Baptiste Queru
2010-10-08 13:32:30 -07:00
committed by Android Git Automerger
parent b323559b13 38f534882e
commit 965d533733
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

@@ -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);
}