diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2016-01-14 06:28:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-14 06:28:47 +0000 |
| commit | c6c9b2aa66635761b5cebc2faf9e06631c36eab5 (patch) | |
| tree | 03efec9a1cf0cd7a453c07ea22fa60ee3a9f7051 | |
| parent | 658fdf8426e5c0fb68b7c04af651eae93a32b4b4 (diff) | |
| parent | 1bbc082a47941471aeaf59078f101676d9ad7da4 (diff) | |
| download | base-c6c9b2aa66635761b5cebc2faf9e06631c36eab5.tar.gz | |
Merge "Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]" into mnc-dr1.5-dev
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 392e503ea4ef..f76dfb2609c9 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -409,6 +409,9 @@ <!-- Boolean indicating whether or not wifi firmware debugging is enabled --> <bool translatable="false" name="config_wifi_enable_wifi_firmware_debugging">false</bool> + <!-- Boolean indicating whether or not wifi should turn off when emergency call is made --> + <bool translatable="false" name="config_wifi_turn_off_during_emergency_call">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 cbccd1912204..e709500b14ec 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -308,6 +308,7 @@ <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_wifi_enable_wifi_firmware_debugging" /> + <java-symbol type="bool" name="config_wifi_turn_off_during_emergency_call" /> <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" /> |