summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vinit Deshpande <vinitd@google.com> 2015-09-24 04:17:40 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-24 04:17:40 +0000
commit2bc3ff3cf6b692a4bd69d75cb3e11fc0b0b063fe (patch)
treec113b3dab7407dd168d63c540c83c3c8629f976e
parentb278ea0cab555f16d0d8278ee3eadf75c6266920 (diff)
parentde02fe2afdc835eca72bb05a1514daa439bb2b40 (diff)
am de02fe2a: am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
* commit 'de02fe2afdc835eca72bb05a1514daa439bb2b40': Disable wifi firmware logging by default
-rw-r--r--core/res/res/values/config.xml3
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 33ef8f906b30..f1e26aafe963 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -406,6 +406,9 @@
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>
+ <!-- Boolean indicating whether or not wifi firmware debugging is enabled -->
+ <bool translatable="false" name="config_wifi_enable_wifi_firmware_debugging">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 1122c6278227..bdbc86f41e6f 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -306,6 +306,7 @@
<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_wifi_enable_wifi_firmware_debugging" />
<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" />