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

Commit 62a22d5b authored by xinhe's avatar xinhe
Browse files

resolved conflicts for merge of 046f3843 to lmp-sprout-dev(DO NOT MERGE) 

The change is already in MR1 branch

Change-Id: I4ae35a8f76fdc2d4b1cdf2773dc27ff2da85b5ff
parents 5fafd21b 046f3843

core/res/res/values-mcc204-mnc04/config.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -31,4 +31,9 @@ 
        <item>"*611:+19085594899,BAE0000000000000"</item>

        <item>"*611:+19085594899,BAE0000000000000"</item>

        <item>"*86:+1MDN,BAE0000000000000"</item>

        <item>"*86:+1MDN,BAE0000000000000"</item>

    </string-array>

    </string-array>



    <string-array translatable="false" name="config_sms_convert_destination_number_support">

        <item>true;BAE0000000000000</item>

        <item>false</item>

    </string-array>

</resources>
 
</resources>

core/res/res/values-mcc310-mnc004/config.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -34,4 +34,9 @@ 
    </string-array>

    </string-array>





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

    <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>
 
</resources>

core/res/res/values-mcc311-mnc480/config.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -49,4 +49,9 @@ 
        <item>"*611:+19085594899,"</item>

        <item>"*611:+19085594899,"</item>

        <item>"*86:+1MDN,"</item>

        <item>"*86:+1MDN,"</item>

    </string-array>

    </string-array>



    <string-array translatable="false" name="config_sms_convert_destination_number_support">

        <item>true</item>

    </string-array>



</resources>
 
</resources>

core/res/res/values/config.xml

+16 −0
Original line number Original line Diff line number Diff line
@@ -1895,4 +1895,20 @@ 
    <bool name="config_switch_phone_on_voice_reg_state_change">true</bool>

    <bool name="config_switch_phone_on_voice_reg_state_change">true</bool>





    <bool name="config_sms_force_7bit_encoding">false</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>
 
</resources>

core/res/res/values/symbols.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -2087,7 +2087,7 @@ 
  <java-symbol type="bool" name="config_switch_phone_on_voice_reg_state_change" />

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

  <java-symbol type="string" name="whichHomeApplicationNamed" />

  <java-symbol type="string" name="whichHomeApplicationNamed" />

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

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



  <!-- From MSIM Account -->

  <!-- From MSIM Account -->

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

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

  <java-symbol type="array" name="config_sms_convert_destination_number_support" />

</resources>
 
</resources>