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

Merge change 2092 into donut

Browse Source 
* changes:
  Make sure smsHeader != null before using it.
This commit is contained in:
Android (Google) Code Review
2009-05-20 13:00:22 -07:00
parent e29146158b 31fd22923a
commit f209b46c52
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
View File

@@ -138,7 +138,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher {
byte[][] pdus = new byte[1][]; byte[][] pdus = new byte[1][];
pdus[0] = sms.getPdu(); pdus[0] = sms.getPdu();
if (smsHeader.portAddrs != null) { if (smsHeader != null && smsHeader.portAddrs != null) {
if (smsHeader.portAddrs.destPort == SmsHeader.PORT_WAP_PUSH) { if (smsHeader.portAddrs.destPort == SmsHeader.PORT_WAP_PUSH) {
// GSM-style WAP indication // GSM-style WAP indication
mWapPush.dispatchWapPdu(sms.getUserData()); mWapPush.dispatchWapPdu(sms.getUserData());

2
telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
View File

@@ -122,7 +122,7 @@ final class GsmSMSDispatcher extends SMSDispatcher {
byte[][] pdus = new byte[1][]; byte[][] pdus = new byte[1][];
pdus[0] = sms.getPdu(); pdus[0] = sms.getPdu();
if (smsHeader.portAddrs != null) { if (smsHeader != null && smsHeader.portAddrs != null) {
if (smsHeader.portAddrs.destPort == SmsHeader.PORT_WAP_PUSH) { if (smsHeader.portAddrs.destPort == SmsHeader.PORT_WAP_PUSH) {
mWapPush.dispatchWapPdu(sms.getUserData()); mWapPush.dispatchWapPdu(sms.getUserData());
} }