summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinit Deshpande <vinitd@google.com>2015-09-24 04:05:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-24 04:05:26 +0000
commitde02fe2afdc835eca72bb05a1514daa439bb2b40 (patch)
tree406073ffcc2bf53b91456b23b477c5f8428c6611
parent27f26df629e7a5c2ea87ad46708dc4678c11d27a (diff)
parent629909e02b97796ff0b79dbd03c2e72dd3d1e6bb (diff)
downloadframeworks_base-de02fe2afdc835eca72bb05a1514daa439bb2b40.zip
frameworks_base-de02fe2afdc835eca72bb05a1514daa439bb2b40.tar.gz
frameworks_base-de02fe2afdc835eca72bb05a1514daa439bb2b40.tar.bz2
am 629909e0: Merge "Disable wifi firmware logging by default" into mnc-dr-dev
* commit '629909e02b97796ff0b79dbd03c2e72dd3d1e6bb': 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 33ef8f9..f1e26aa 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 1122c62..bdbc86f 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" />