Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add new default_reserved_data_coding_scheme config"

Browse Source
This commit is contained in:
Treehugger Robot
2019-08-28 07:57:29 +00:00
committed by Gerrit Code Review
parent c53985fc51 839729c850
commit 7a71de717b
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/res/values-mcc450-mnc08/config.xml
View File

@@ -28,4 +28,14 @@
<!-- Do not set the system language as value of EF LI/EF PL -->
<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>

10
core/res/res/values/config.xml
View File

@@ -2824,6 +2824,16 @@
string that's stored in 8-bit unpacked format) characters.-->
<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
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.

1
core/res/res/values/symbols.xml
View File

@@ -2498,6 +2498,7 @@
<java-symbol type="attr" name="ambientShadowAlpha" />
<java-symbol type="attr" name="spotShadowAlpha" />
<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="attr" name="checkMarkGravity" />
<java-symbol type="layout" name="select_dialog_singlechoice_material" />

6
telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
View File

@@ -1218,6 +1218,7 @@ public class SmsMessage extends SmsMessageBase {
int encodingType = ENCODING_UNKNOWN;
Resources r = Resources.getSystem();
// Look up the data encoding scheme
if ((mDataCodingScheme & 0x80) == 0) {
userDataCompressed = (0 != (mDataCodingScheme & 0x20));
@@ -1239,7 +1240,6 @@ public class SmsMessage extends SmsMessageBase {
case 1: // 8 bit data
//Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet string
//that's stored in 8-bit unpacked format) characters.
Resources r = Resources.getSystem();
if (r.getBoolean(com.android.internal.
R.bool.config_sms_decode_gsm_8bit_data)) {
encodingType = ENCODING_8BIT;
@@ -1249,7 +1249,8 @@ public class SmsMessage extends SmsMessageBase {
case 3: // reserved
Rlog.w(LOG_TAG, "1 - Unsupported SMS data coding scheme "
+ (mDataCodingScheme & 0xff));
encodingType = ENCODING_8BIT;
encodingType = r.getInteger(
com.android.internal.R.integer.default_reserved_data_coding_scheme);
break;
}
}
@@ -1403,7 +1404,6 @@ public class SmsMessage extends SmsMessageBase {
case ENCODING_8BIT:
//Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet string
//that's stored in 8-bit unpacked format) characters.
Resources r = Resources.getSystem();
if (r.getBoolean(com.android.internal.
R.bool.config_sms_decode_gsm_8bit_data)) {
mMessageBody = p.getUserDataGSM8bit(count);