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

Commit 3cf4dbab authored by Sungmin Choi's avatar Sungmin Choi Committed by Vineeta Srivastava
Browse files

telephony: Set roam though same named operator 

Show roaming icon though same named operators.
Though same mcc and same operator name, some operator want to roam.
For example, users of 40485 should see the roaming icon as using 40483
network though same Reliance network.
To do this, add 40483 item to values-mcc404-mnc85/config.xml

Bug: 10699045, 10703022
Change-Id: Ife1024ef10a29e43e32040800b25feca9f51fb62

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
parent 5cab967b

core/res/res/values-mcc404-mnc17/config.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2013, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Show roaming icon though same named operators. -->

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

        <item>40491</item>

    </string-array>

</resources>

core/res/res/values-mcc404-mnc85/config.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2013, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Show roaming icon though same named operators. -->

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

        <item>40483</item>

    </string-array>

</resources>

core/res/res/values-mcc530-mnc24/config.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/*

** Copyright 2013, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Show roaming icon though same named operators. -->

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

        <item>53001</item>

    </string-array>

</resources>

core/res/res/values/config.xml

+9 −0
Original line number Diff line number Diff line
@@ -1259,4 +1259,13 @@ 
    <!-- For some operators, PDU has garbages. To fix it, need to use valid index -->

    <integer name="config_valid_wappush_index">-1</integer>



    <!-- Show roaming icon though same named operators.

         Uses "startsWith" so you can use a leading substring like the mcc or

         use the complete mcc+mnc string.

         Though same mcc and same operator name, some operator want to roam.

         user of 40485 should see the roaming icon as using 40483 network

         though same Reliance network.

         To do this, add 40483 item to values-mcc404-mnc85/config.xml -->

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

    </string-array>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -975,6 +975,7 @@ 
  <java-symbol type="array" name="config_cdma_dun_supported_types" />

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

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

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



  <java-symbol type="drawable" name="default_wallpaper" />

  <java-symbol type="drawable" name="indicator_input_error" />