Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fb06404 authored May 20, 2009 by Android (Google) Code Review Committed by The Android Open Source Project May 20, 2009

am f209b46c: Merge change 2092 into donut

Merge commit 'f209b46c'

* commit 'f209b46c':
  Make sure smsHeader != null before using it.

parents 0795272a f209b46c

telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher {
		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());

telephony/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ final class GsmSMSDispatcher extends SMSDispatcher {
		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());
		}