summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sean Wan <swan@google.com> 2015-04-17 23:45:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-04-17 23:45:37 +0000
commitb792f43301c61cce996dd5bac4589b4720a37bec (patch)
tree461b591315fd7b502e091f9ac5be245611995978
parentc1002dfc52ec2827d24b6c4722a47abbb99b7f16 (diff)
parent79858a32605811d04c81a2981711b2d7564f991c (diff)
Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev
-rwxr-xr-xcore/res/res/values/config.xml3
-rwxr-xr-xcore/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 3f020fd849ee..d5a6d72ffe5e 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -437,6 +437,9 @@
point on the move. A value of 0 means no periodic scans will be used in the framework. -->
<integer translatable="false" name="config_wifi_framework_scan_interval">300000</integer>
+ <!-- Integer indicating disconnect mode scan interval in milliseconds -->
+ <integer translatable="false" name="config_wifi_disconnected_scan_interval">10000</integer>
+
<!-- Integer indicating associated partial scan interval in milliseconds -->
<integer translatable="false" name="config_wifi_framework_associated_scan_interval">20000</integer>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 83be3711831a..a645b4ea1a9e 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -371,6 +371,7 @@
<java-symbol type="integer" name="config_shortPressOnSleepBehavior" />
<java-symbol type="integer" name="config_wifi_framework_scan_interval" />
<java-symbol type="integer" name="config_wifi_supplicant_scan_interval" />
+ <java-symbol type="integer" name="config_wifi_disconnected_scan_interval" />
<java-symbol type="integer" name="config_wifi_scan_interval_p2p_connected" />
<java-symbol type="integer" name="db_connection_pool_size" />
<java-symbol type="integer" name="db_journal_size_limit" />