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

Merge "Roaming blacklist" into lmp-dev

Browse Source
This commit is contained in:
Amit Mahajan
2014-10-01 00:44:01 +00:00
committed by Android (Google) Code Review
parent cd8e73817d a902fe5fbf
commit 496aeb1a61
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values-mcc310-mnc150/config.xml
View File

@@ -24,8 +24,10 @@
<item>310140</item> <item>310140</item>
<item>310400</item> <item>310400</item>
<item>310470</item> <item>310470</item>
<item>311170</item>
</string-array> </string-array>
<string-array translatable="false" name="config_operatorConsideredNonRoaming"> <string-array translatable="false" name="config_operatorConsideredNonRoaming">
<item>310</item>
<item>311</item> <item>311</item>
<item>312</item> <item>312</item>
<item>313</item> <item>313</item>

4
core/res/res/values-mcc310-mnc410/config.xml
View File

@@ -30,9 +30,11 @@
<item>310140</item> <item>310140</item>
<item>310400</item> <item>310400</item>
<item>310470</item> <item>310470</item>
<item>311170</item>
</string-array> </string-array>
<!-- BEGIN Motorola, xnk746, Feb-12-2014, IKVPREL2KK-1468 -->
<string-array translatable="false" name="config_operatorConsideredNonRoaming"> <string-array translatable="false" name="config_operatorConsideredNonRoaming">
<item>310</item>
<item>311</item> <item>311</item>
<item>312</item> <item>312</item>
<item>313</item> <item>313</item>

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

@@ -1636,6 +1636,7 @@
<bool name="config_stkNoAlphaUsrCnf">true</bool> <bool name="config_stkNoAlphaUsrCnf">true</bool>
<!-- Don't use roaming icon for considered operators. <!-- Don't use roaming icon for considered operators.
A match on config_sameNamedOperatorConsideredRoaming supersedes a match on this.
Can use mcc or mcc+mnc as item. For example, 302 or 21407. Can use mcc or mcc+mnc as item. For example, 302 or 21407.
If operators, 21404 and 21407, make roaming agreements, user of 21404 should not see If operators, 21404 and 21407, make roaming agreements, user of 21404 should not see
the roaming icon as using 21407 network. the roaming icon as using 21407 network.
@@ -1650,10 +1651,12 @@
<!-- For some operators, PDU has garbages. To fix it, need to use valid index --> <!-- For some operators, PDU has garbages. To fix it, need to use valid index -->
<integer name="config_valid_wappush_index">-1</integer> <integer name="config_valid_wappush_index">-1</integer>
<!-- Show roaming icon though same named operators. <!-- This is NOT just for same named operators unlike the name suggests (will blacklist regardless of name).
A match on this supersedes a match on config_operatorConsideredNonRoaming.
Uses "startsWith" so you can use a leading substring like the mcc or Uses "startsWith" so you can use a leading substring like the mcc or
use the complete mcc+mnc string. use the complete mcc+mnc string.
Though same mcc and same operator name, some operator want to roam. For a given mcc/mcc-mnc, some operators may want to roam (even if
config_operatorConsideredNonRoaming has the mcc/mcc-mnc).
user of 40485 should see the roaming icon as using 40483 network user of 40485 should see the roaming icon as using 40483 network
though same Reliance network. though same Reliance network.
To do this, add 40483 item to values-mcc404-mnc85/config.xml --> To do this, add 40483 item to values-mcc404-mnc85/config.xml -->