commit | f209b46c52dc25fbd2c08b14824de9845cc64b07 | [log] [tgz] |
---|---|---|
author | Android (Google) Code Review <android-gerrit@google.com> | Wed May 20 13:00:22 2009 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 20 13:00:22 2009 -0700 |
tree | 0245065747030eeb4e6d8a2a481a0a0ea41f098d | |
parent | e29146158b6048936671decc060d398a68333fc0 [diff] | |
parent | 31fd22923aaefc85652a5b5939c6d4aa6fa289e2 [diff] |
Merge change 2092 into donut * changes: Make sure smsHeader != null before using it.
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java index 2bb17e4..a3d00d7 100644 --- a/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java +++ b/telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
@@ -138,7 +138,7 @@ byte[][] pdus = new byte[1][]; pdus[0] = sms.getPdu(); - if (smsHeader.portAddrs != null) { + if (smsHeader != null && smsHeader.portAddrs != null) { if (smsHeader.portAddrs.destPort == SmsHeader.PORT_WAP_PUSH) { // GSM-style WAP indication mWapPush.dispatchWapPdu(sms.getUserData());
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java b/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java index 2fce188..699142a 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
@@ -122,7 +122,7 @@ byte[][] pdus = new byte[1][]; pdus[0] = sms.getPdu(); - if (smsHeader.portAddrs != null) { + if (smsHeader != null && smsHeader.portAddrs != null) { if (smsHeader.portAddrs.destPort == SmsHeader.PORT_WAP_PUSH) { mWapPush.dispatchWapPdu(sms.getUserData()); }