diff options
| author | xin He <xinhe@google.com> | 2015-09-08 21:09:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-08 21:09:13 +0000 |
| commit | 2248874b8b7503b484556a1b46fdb23379fbc107 (patch) | |
| tree | 8969c26e2b73eb55b7c4628f83d352be69d76daa /core | |
| parent | 10352f7a48433b5b76cd5d35a5eec6c3df203a1f (diff) | |
| parent | ee1babecd204def48feb1fcf648dbed5cd760697 (diff) | |
| download | frameworks_base-2248874b8b7503b484556a1b46fdb23379fbc107.zip frameworks_base-2248874b8b7503b484556a1b46fdb23379fbc107.tar.gz frameworks_base-2248874b8b7503b484556a1b46fdb23379fbc107.tar.bz2 | |
am ee1babec: Merge "Introduce config_wifi_revert_country_code_on_cellular_loss" into mnc-dr-dev
* commit 'ee1babecd204def48feb1fcf648dbed5cd760697':
Introduce config_wifi_revert_country_code_on_cellular_loss
Diffstat (limited to 'core')
| -rwxr-xr-x | core/res/res/values/config.xml | 4 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 77d79ad..b958c4b 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -402,6 +402,10 @@ <!-- Boolean indicating autojoin will prefer 5GHz and choose 5GHz BSSIDs --> <bool translatable="true" name="config_wifi_enable_5GHz_preference">true</bool> + <!-- Boolean indicating whether or not to revert to default country code when cellular + radio is unable to find any MCC information to infer wifi country code from --> + <bool translatable="false" name="config_wifi_revert_country_code_on_cellular_loss">false</bool> + <!-- Integer specifying the basic autojoin parameters --> <integer translatable="false" name="config_wifi_framework_5GHz_preference_boost_threshold">-65</integer> <integer translatable="false" name="config_wifi_framework_5GHz_preference_boost_factor">5</integer> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 35443fe..57d7c0e 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -305,6 +305,7 @@ <java-symbol type="bool" name="config_wifi_only_link_same_credential_configurations" /> <java-symbol type="bool" name="config_wifi_enable_disconnection_debounce" /> <java-symbol type="bool" name="config_wifi_enable_5GHz_preference" /> + <java-symbol type="bool" name="config_wifi_revert_country_code_on_cellular_loss" /> <java-symbol type="bool" name="config_supportMicNearUltrasound" /> <java-symbol type="bool" name="config_supportSpeakerNearUltrasound" /> <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" /> |