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

Commit f209b46c authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 2092 into donut 

* changes:
  Make sure smsHeader != null before using it.
parents e2914615 31fd2292

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());

                }