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

Commit 9776c4cc authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Avoid NPE caused by null encodedBearerData in privateGetSubmitPdu" 

am: f5523412

Change-Id: Iaa6f514ca0032c8cf4d6da46192e3346f9d12d38
parents 625155b1 f5523412

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

+1 −1
Original line number Diff line number Diff line
@@ -858,11 +858,11 @@ public class SmsMessage extends SmsMessageBase { 
        bearerData.userData = userData;



        byte[] encodedBearerData = BearerData.encode(bearerData);

        if (encodedBearerData == null) return null;

        if (Rlog.isLoggable(LOGGABLE_TAG, Log.VERBOSE)) {

            Rlog.d(LOG_TAG, "MO (encoded) BearerData = " + bearerData);

            Rlog.d(LOG_TAG, "MO raw BearerData = '" + HexDump.toHexString(encodedBearerData) + "'");

        }

        if (encodedBearerData == null) return null;



        int teleservice = bearerData.hasUserDataHeader ?

                SmsEnvelope.TELESERVICE_WEMT : SmsEnvelope.TELESERVICE_WMT;