Merge "DO NOT MERGE: Make wifi scan interval when disconnected configurable." into lmp-mr1-modular-dev

This commit is contained in:
Sean Wan
2015-04-17 23:45:37 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 0 deletions

View File

@@ -437,6 +437,9 @@
point on the move. A value of 0 means no periodic scans will be used in the framework. --> 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 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 indicating associated partial scan interval in milliseconds -->
<integer translatable="false" name="config_wifi_framework_associated_scan_interval">20000</integer> <integer translatable="false" name="config_wifi_framework_associated_scan_interval">20000</integer>

View File

@@ -371,6 +371,7 @@
<java-symbol type="integer" name="config_shortPressOnSleepBehavior" /> <java-symbol type="integer" name="config_shortPressOnSleepBehavior" />
<java-symbol type="integer" name="config_wifi_framework_scan_interval" /> <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_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="config_wifi_scan_interval_p2p_connected" />
<java-symbol type="integer" name="db_connection_pool_size" /> <java-symbol type="integer" name="db_connection_pool_size" />
<java-symbol type="integer" name="db_journal_size_limit" /> <java-symbol type="integer" name="db_journal_size_limit" />