diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2014-10-01 00:44:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-01 00:44:03 +0000 |
| commit | 496aeb1a6156f3c089135a7ce4fab550589eaff7 (patch) | |
| tree | 6c07e37272f46fe82fe6dc446f5401cfde06d352 /core | |
| parent | cd8e73817d14798f9d2031ffd301a03a096b7907 (diff) | |
| parent | a902fe5fbf14847cba98d0e3c73a78ff61fbf566 (diff) | |
| download | frameworks_base-496aeb1a6156f3c089135a7ce4fab550589eaff7.zip frameworks_base-496aeb1a6156f3c089135a7ce4fab550589eaff7.tar.gz frameworks_base-496aeb1a6156f3c089135a7ce4fab550589eaff7.tar.bz2 | |
Merge "Roaming blacklist" into lmp-dev
Diffstat (limited to 'core')
| -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 3f9330d..3588f32 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 1cc8d4f..d17509c 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 bd9e2f6..4be9370 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -1636,6 +1636,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. @@ -1650,10 +1651,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 --> |