Merge "Add configuration to control converting sms destination number" into lmp-dev

This commit is contained in:
xinhe
2014-11-19 17:47:23 +00:00
committed by Android (Google) Code Review
5 changed files with 32 additions and 0 deletions

View File

@@ -31,4 +31,9 @@
<item>"*611:+19085594899,BAE0000000000000"</item>
<item>"*86:+1MDN,BAE0000000000000"</item>
</string-array>
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>true;BAE0000000000000</item>
<item>false</item>
</string-array>
</resources>

View File

@@ -34,4 +34,9 @@
</string-array>
<bool name="config_auto_attach_data_on_creation">false</bool>
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>true</item>
</string-array>
</resources>

View File

@@ -49,4 +49,9 @@
<item>"*611:+19085594899,"</item>
<item>"*86:+1MDN,"</item>
</string-array>
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>true</item>
</string-array>
</resources>

View File

@@ -1853,4 +1853,20 @@
<bool name="config_switch_phone_on_voice_reg_state_change">true</bool>
<bool name="config_sms_force_7bit_encoding">false</bool>
<!-- This config is used to check if the carrier requires converting destination
number before sending out a SMS.
Formats for this configuration as below:
[true or false][;optional gid]
The logic to pick up the configuration:
(1) If the "config_sms_convert_destination_number_support" array has no gid
special item, the last one will be picked
(2) If the "config_sms_convert_destination_number_support" array has gid special
item and it matches the current sim's gid, it will be picked.
(3) If the "config_sms_convert_destination_number_support" array has gid special
item but it doesn't match the current sim's gid, the last one without gid
will be picked -->
<string-array translatable="false" name="config_sms_convert_destination_number_support">
<item>false</item>
</string-array>
</resources>

View File

@@ -2072,4 +2072,5 @@
<java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" />
<java-symbol type="string" name="whichHomeApplicationNamed" />
<java-symbol type="bool" name="config_sms_force_7bit_encoding" />
<java-symbol type="array" name="config_sms_convert_destination_number_support" />
</resources>