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

Commit f5523412 authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Avoid NPE caused by null encodedBearerData in privateGetSubmitPdu"

parents 74a0dd80 c692ce76
Loading
Loading
Loading
Loading
+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;