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

Commit 6de48e4a authored by Sukanya Rajkhowa's avatar Sukanya Rajkhowa Committed by Brad Ebinger
Browse files

Telephony: Add 7bit Ascii support for long message 

Add 7bit Ascii encoding and decoding support for long messages

Bug: 37289589
Test: atest FrameworksTelephonyTests

Change-Id: I7c2cd91d0aef0d6436d250544db9bf2131e35075
parent 3d1de200

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -2423,6 +2423,14 @@ public class CarrierConfigManager { 
    public static final String KEY_5G_ICON_CONFIGURATION_STRING =

            "5g_icon_configuration_string";



    /**

     * Support ASCII 7-BIT encoding for long SMS. This carrier config is used to enable

     * this feature.

     * @hide

     */

    public static final String KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL =

            "ascii_7_bit_support_for_long_message_bool";



    /**

     * Controls RSRP threshold at which OpportunisticNetworkService will decide whether

     * the opportunistic network is good enough for internet data.
@@ -2951,6 +2959,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_CALL_WAITING_SERVICE_CLASS_INT, 1 /* SERVICE_CLASS_VOICE */);

        sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,

                "connected_mmwave:None,connected:5G,not_restricted:None,restricted:None");

        sDefaults.putBoolean(KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL, false);

        /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_GOOD */

        sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSRP_INT, -108);

        /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_MODERATE */

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

+47 −3
Original line number Diff line number Diff line
@@ -596,6 +596,45 @@ public final class BearerData { 
        System.arraycopy(payload, 0, uData.payload, udhBytes, payload.length);

    }



    private static void encode7bitAsciiEms(UserData uData, byte[] udhData, boolean force)

            throws CodingException

    {

        try {

            Rlog.d(LOG_TAG, "encode7bitAsciiEms");

            int udhBytes = udhData.length + 1;  // Add length octet.

            int udhSeptets = ((udhBytes * 8) + 6) / 7;

            int paddingBits = (udhSeptets * 7) - (udhBytes * 8);

            String msg = uData.payloadStr;

            byte[] payload ;

            int msgLen = msg.length();

            BitwiseOutputStream outStream = new BitwiseOutputStream(msgLen +

                    (paddingBits > 0 ? 1 : 0));

            outStream.write(paddingBits, 0);

            for (int i = 0; i < msgLen; i++) {

                int charCode = UserData.charToAscii.get(msg.charAt(i), -1);

                if (charCode == -1) {

                    if (force) {

                        outStream.write(7, UserData.UNENCODABLE_7_BIT_CHAR);

                    } else {

                        throw new CodingException("cannot ASCII encode (" + msg.charAt(i) + ")");

                    }

                } else {

                    outStream.write(7, charCode);

                }

            }

            payload = outStream.toByteArray();

            uData.msgEncoding = UserData.ENCODING_7BIT_ASCII;

            uData.msgEncodingSet = true;

            uData.numFields = udhSeptets + uData.payloadStr.length();

            uData.payload = new byte[udhBytes + payload.length];

            uData.payload[0] = (byte)udhData.length;

            System.arraycopy(udhData, 0, uData.payload, 1, udhData.length);

            System.arraycopy(payload, 0, uData.payload, udhBytes, payload.length);

        } catch (BitwiseOutputStream.AccessException ex) {

            throw new CodingException("7bit ASCII encode failed: " + ex);

        }

    }



    private static void encodeEmsUserDataPayload(UserData uData)

        throws CodingException

    {
@@ -605,6 +644,8 @@ public final class BearerData { 
                encode7bitEms(uData, headerData, true);

            } else if (uData.msgEncoding == UserData.ENCODING_UNICODE_16) {

                encode16bitEms(uData, headerData);

            } else if (uData.msgEncoding == UserData.ENCODING_7BIT_ASCII) {

                encode7bitAsciiEms(uData, headerData, true);

            } else {

                throw new CodingException("unsupported EMS user data encoding (" +

                                          uData.msgEncoding + ")");
@@ -1056,15 +1097,18 @@ public final class BearerData { 
        throws CodingException

    {

        try {

            offset *= 8;

            int offsetBits = offset * 8;

            int offsetSeptets = (offsetBits + 6) / 7;

            numFields -= offsetSeptets;



            StringBuffer strBuf = new StringBuffer(numFields);

            BitwiseInputStream inStream = new BitwiseInputStream(data);

            int wantedBits = (offset * 8) + (numFields * 7);

            int wantedBits = (offsetSeptets * 7) + (numFields * 7);

            if (inStream.available() < wantedBits) {

                throw new CodingException("insufficient data (wanted " + wantedBits +

                                          " bits, but only have " + inStream.available() + ")");

            }

            inStream.skip(offset);

            inStream.skip(offsetSeptets * 7);

            for (int i = 0; i < numFields; i++) {

                int charCode = inStream.read(7);

                if ((charCode >= UserData.ASCII_MAP_BASE_INDEX) &&

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

+3 −2
Original line number Diff line number Diff line
@@ -864,8 +864,9 @@ public class SmsMessage extends SmsMessageBase { 
        }

        if (encodedBearerData == null) return null;



        int teleservice = bearerData.hasUserDataHeader ?

                SmsEnvelope.TELESERVICE_WEMT : SmsEnvelope.TELESERVICE_WMT;

        int teleservice = (bearerData.hasUserDataHeader

                && userData.msgEncoding != UserData.ENCODING_7BIT_ASCII)

                ? SmsEnvelope.TELESERVICE_WEMT : SmsEnvelope.TELESERVICE_WMT;



        SmsEnvelope envelope = new SmsEnvelope();

        envelope.messageType = SmsEnvelope.MESSAGE_TYPE_POINT_TO_POINT;