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

Commit 6a814fba authored by Taesu Lee's avatar Taesu Lee Committed by android-build-merger
Browse files

Merge "Add new default_reserved_data_coding_scheme config" am: 7a71de71 am:... 

Merge "Add new default_reserved_data_coding_scheme config" am: 7a71de71 am: 3676ee2e am: efa8e27c am: a588cb66
am: 5dc7d3b0

Change-Id: I4aa80ab327c8956a7fc7f62f2745a038ab4eea79
parents c0cd2454 5dc7d3b0

core/res/res/values-mcc450-mnc08/config.xml

+10 −0
Original line number Original line Diff line number Diff line
@@ -28,4 +28,14 @@ 
    <!-- Do not set the system language as value of EF LI/EF PL -->

    <!-- Do not set the system language as value of EF LI/EF PL -->

    <bool name="config_use_sim_language_file">false</bool>

    <bool name="config_use_sim_language_file">false</bool>





    <!-- Configures encoding type to parse the User Data of an SMS for reserved TP-DCS value.

         Refer to SmsConstants.java

         ENCODING_UNKNOWN = 0;

         ENCODING_7BIT = 1;

         ENCODING_8BIT = 2;

         ENCODING_16BIT = 3;

         ENCODING_KSC5601 = 4;

         -->

    <integer name="default_reserved_data_coding_scheme">4</integer>



</resources>
 
</resources>

core/res/res/values/config.xml

+10 −0
Original line number Original line Diff line number Diff line
@@ -3038,6 +3038,16 @@ 
        string that's stored in 8-bit unpacked format) characters.-->

        string that's stored in 8-bit unpacked format) characters.-->

    <bool translatable="false" name="config_sms_decode_gsm_8bit_data">false</bool>

    <bool translatable="false" name="config_sms_decode_gsm_8bit_data">false</bool>





    <!-- Configures encoding type to parse the User Data of an SMS for reserved TP-DCS value.

         Refer to SmsConstants.java

         ENCODING_UNKNOWN = 0;

         ENCODING_7BIT = 1;

         ENCODING_8BIT = 2;

         ENCODING_16BIT = 3;

         ENCODING_KSC5601 = 4;

         -->

    <integer name="default_reserved_data_coding_scheme">2</integer>



    <!-- If EMS is not supported, framework breaks down EMS into single segment SMS

    <!-- If EMS is not supported, framework breaks down EMS into single segment SMS

         and adds page info " x/y". This config is used to set which carrier doesn't

         and adds page info " x/y". This config is used to set which carrier doesn't

         support EMS and whether page info should be added at the beginning or the end.

         support EMS and whether page info should be added at the beginning or the end.

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -2657,6 +2657,7 @@ 
  <java-symbol type="attr" name="ambientShadowAlpha" />

  <java-symbol type="attr" name="ambientShadowAlpha" />

  <java-symbol type="attr" name="spotShadowAlpha" />

  <java-symbol type="attr" name="spotShadowAlpha" />

  <java-symbol type="bool" name="config_sms_decode_gsm_8bit_data" />

  <java-symbol type="bool" name="config_sms_decode_gsm_8bit_data" />

  <java-symbol type="integer" name="default_reserved_data_coding_scheme" />

  <java-symbol type="dimen" name="text_size_small_material" />

  <java-symbol type="dimen" name="text_size_small_material" />

  <java-symbol type="attr" name="checkMarkGravity" />

  <java-symbol type="attr" name="checkMarkGravity" />

  <java-symbol type="layout" name="select_dialog_singlechoice_material" />

  <java-symbol type="layout" name="select_dialog_singlechoice_material" />

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -1247,6 +1247,7 @@ public class SmsMessage extends SmsMessageBase { 




        int encodingType = ENCODING_UNKNOWN;

        int encodingType = ENCODING_UNKNOWN;





        Resources r = Resources.getSystem();

        // Look up the data encoding scheme

        // Look up the data encoding scheme

        if ((mDataCodingScheme & 0x80) == 0) {

        if ((mDataCodingScheme & 0x80) == 0) {

            userDataCompressed = (0 != (mDataCodingScheme & 0x20));

            userDataCompressed = (0 != (mDataCodingScheme & 0x20));
@@ -1268,7 +1269,6 @@ public class SmsMessage extends SmsMessageBase { 
                case 1: // 8 bit data

                case 1: // 8 bit data

                    //Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet string

                    //Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet string

                    //that's stored in 8-bit unpacked format) characters.

                    //that's stored in 8-bit unpacked format) characters.

                    Resources r = Resources.getSystem();

                    if (r.getBoolean(com.android.internal.

                    if (r.getBoolean(com.android.internal.

                            R.bool.config_sms_decode_gsm_8bit_data)) {

                            R.bool.config_sms_decode_gsm_8bit_data)) {

                        encodingType = ENCODING_8BIT;

                        encodingType = ENCODING_8BIT;
@@ -1278,7 +1278,8 @@ public class SmsMessage extends SmsMessageBase { 
                case 3: // reserved

                case 3: // reserved

                    Rlog.w(LOG_TAG, "1 - Unsupported SMS data coding scheme "

                    Rlog.w(LOG_TAG, "1 - Unsupported SMS data coding scheme "

                            + (mDataCodingScheme & 0xff));

                            + (mDataCodingScheme & 0xff));

                    encodingType = ENCODING_8BIT;

                    encodingType = r.getInteger(

                            com.android.internal.R.integer.default_reserved_data_coding_scheme);

                    break;

                    break;

                }

                }

            }

            }
@@ -1432,7 +1433,6 @@ public class SmsMessage extends SmsMessageBase { 
        case ENCODING_8BIT:

        case ENCODING_8BIT:

            //Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet string

            //Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet string

            //that's stored in 8-bit unpacked format) characters.

            //that's stored in 8-bit unpacked format) characters.

            Resources r = Resources.getSystem();

            if (r.getBoolean(com.android.internal.

            if (r.getBoolean(com.android.internal.

                    R.bool.config_sms_decode_gsm_8bit_data)) {

                    R.bool.config_sms_decode_gsm_8bit_data)) {

                mMessageBody = p.getUserDataGSM8bit(count);

                mMessageBody = p.getUserDataGSM8bit(count);