summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vinit Deshpande <vinitd@google.com> 2016-01-13 16:58:30 -0800
committer Vinit Deshpande <vinitd@google.com> 2016-01-14 17:24:39 -0800
commit19ec617fd531978f83080758226bd3245c82ec29 (patch)
treeaef0c7fd2179d0b3991b3882f65952a736e88222
parente540b64aaf58460f7930a5e4937cee660215c948 (diff)
Allow turning off Wi-Fi when emergency call is made
Bug: 24147407 Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
-rw-r--r--core/res/res/values/config.xml5
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 5 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index b7750a478f83..24d2497da6bb 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -409,7 +409,10 @@
<!-- Boolean indicating whether or not wifi firmware debugging is enabled -->
<bool translatable="false" name="config_wifi_enable_wifi_firmware_debugging">true</bool>
- <!-- Integer specifying the basic Quality Network Selection parameters -->
+ <!-- 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">40</integer>
<integer translatable="false" name="config_wifi_framework_current_association_hysteresis_high">16</integer>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index d83f210d564e..3185ce710d1d 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" />