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

Commit 8c49d32c authored by Tammo Spalink's avatar Tammo Spalink
Browse files

enable additional cdma sms fields and user data encodings 

enable ia5 and octet user data encodings
properly expose parsed user data
support additional bearer data subparameter types
parent 17f213bc

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

+7 −33
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ import java.io.IOException; 
import java.io.UnsupportedEncodingException;

import java.util.Random;



import static android.telephony.SmsMessage.ENCODING_7BIT;

import static android.telephony.SmsMessage.ENCODING_8BIT;

import static android.telephony.SmsMessage.ENCODING_16BIT;

import static android.telephony.SmsMessage.ENCODING_UNKNOWN;

import static android.telephony.SmsMessage.MAX_USER_DATA_BYTES;

import static android.telephony.SmsMessage.MAX_USER_DATA_BYTES_WITH_HEADER;

import static android.telephony.SmsMessage.MAX_USER_DATA_SEPTETS;
@@ -685,41 +681,22 @@ public class SmsMessage extends SmsMessageBase { 
    }



    /**

     * Parses the User Data of an SMS.

     * Copy parsed user data out from internal datastructures.

     */

    private void parseUserData(UserData uData) {

        int encodingType;



        if (null == uData) {

        if (uData == null) {

            return;

        }



        encodingType = uData.msgEncoding;



        // insert DCS-decoding here when type is supported by ril-library



        userData = uData.payload;

        userDataHeader = uData.userDataHeader;



        switch (encodingType) {

        case UserData.ENCODING_GSM_7BIT_ALPHABET:

        case UserData.ENCODING_7BIT_ASCII:

        case UserData.ENCODING_UNICODE_16:

            // user data was already decoded by wmsts-library

            messageBody = new String(userData);

            break;



        // data and unsupported encodings:

        case UserData.ENCODING_OCTET:

        default:

            messageBody = null;

            break;

        }



        if (Config.LOGV) Log.v(LOG_TAG, "SMS message body (raw): '" + messageBody + "'");

        messageBody = uData.payloadStr;



        if (messageBody != null) {

            if (Config.LOGV) Log.v(LOG_TAG, "SMS message body: '" + messageBody + "'");

            parseMessageBody();

        } else if ((userData != null) && (Config.LOGV)) {

            Log.v(LOG_TAG, "SMS payload: '" + IccUtils.bytesToHexString(userData) + "'");

        }

    }
@@ -727,7 +704,7 @@ public class SmsMessage extends SmsMessageBase { 
     * {@inheritDoc}

     */

    public MessageClass getMessageClass() {

        if (BearerData.DISPLAY_IMMEDIATE == mBearerData.displayMode ) {

        if (BearerData.DISPLAY_MODE_IMMEDIATE == mBearerData.displayMode ) {

            return MessageClass.CLASS_0;

        } else {

            return MessageClass.UNKNOWN;
@@ -780,9 +757,6 @@ public class SmsMessage extends SmsMessageBase { 
        mBearerData.readAckReq = false;

        mBearerData.reportReq = false;



        // Set the display mode (See C.S0015-B, v2.0, 4.5.16)

        mBearerData.displayMode = BearerData.DISPLAY_DEFAULT;



        // number of messages: not needed for encoding!



        // indicate whether a user data header is available

telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java

+258 −81

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/com/android/internal/telephony/cdma/sms/UserData.java

+23 −4

File changed.

Preview size limit exceeded, changes collapsed.

tests/AndroidTests/src/com/android/unit_tests/CdmaSmsTest.java

+146 −4

File changed.

Preview size limit exceeded, changes collapsed.