diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2014-10-01 17:11:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 17:11:14 +0000 |
| commit | 7ed7afb51ec2c415c8de8266ea8d38b9a00cdcd0 (patch) | |
| tree | 8fabff580b4cdc2bb7b4dcf9007705397637b629 | |
| parent | 7923da5f5d05f256179e0d926b3b55bbf1d29a8e (diff) | |
| parent | 7f630ae708927e5d76d8a198834ae2233ab3cca9 (diff) | |
am 7f630ae7: am c9ab6f12: am f9a67cf9: am 496aeb1a: Merge "Roaming blacklist" into lmp-dev
* commit '7f630ae708927e5d76d8a198834ae2233ab3cca9':
Roaming blacklist
| -rw-r--r-- | core/res/res/values-mcc310-mnc150/config.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values-mcc310-mnc410/config.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/core/res/res/values-mcc310-mnc150/config.xml b/core/res/res/values-mcc310-mnc150/config.xml index 3f9330d9a760..3588f32727c9 100644 --- a/core/res/res/values-mcc310-mnc150/config.xml +++ b/core/res/res/values-mcc310-mnc150/config.xml @@ -24,8 +24,10 @@ <item>310140</item> <item>310400</item> <item>310470</item> + <item>311170</item> </string-array> <string-array translatable="false" name="config_operatorConsideredNonRoaming"> + <item>310</item> <item>311</item> <item>312</item> <item>313</item> diff --git a/core/res/res/values-mcc310-mnc410/config.xml b/core/res/res/values-mcc310-mnc410/config.xml index 1cc8d4f9e2cb..d17509c600ca 100644 --- a/core/res/res/values-mcc310-mnc410/config.xml +++ b/core/res/res/values-mcc310-mnc410/config.xml @@ -30,9 +30,11 @@ <item>310140</item> <item>310400</item> <item>310470</item> + <item>311170</item> </string-array> - <!-- BEGIN Motorola, xnk746, Feb-12-2014, IKVPREL2KK-1468 --> + <string-array translatable="false" name="config_operatorConsideredNonRoaming"> + <item>310</item> <item>311</item> <item>312</item> <item>313</item> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 30e1a78a82c1..54126e06d94c 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1639,6 +1639,7 @@ <bool name="config_stkNoAlphaUsrCnf">true</bool> <!-- 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. If operators, 21404 and 21407, make roaming agreements, user of 21404 should not see the roaming icon as using 21407 network. @@ -1653,10 +1654,12 @@ <!-- 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. + <!-- 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 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 though same Reliance network. To do this, add 40483 item to values-mcc404-mnc85/config.xml --> |