am b897f013: Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev

automerge: 76dc7a1

* commit '76dc7a1abe2d69013dbc8238292d239ac1287e2c':
  adjust network switching thresholds Bug:18589301
This commit is contained in:
vandwalle
2014-12-11 03:41:48 +00:00
committed by android-build-merger
2 changed files with 4 additions and 0 deletions

View File

@@ -425,6 +425,9 @@
<!-- Integer indicating minimum blacklisting delay of a wofo configuration due to connectin or auth errors -->
<integer translatable="false" name="config_wifi_framework_network_black_list_min_time_milli">120000</integer>
<!-- Integer indicating RSSI boost given to current network -->
<integer translatable="false" name="config_wifi_framework_current_network_boost">25</integer>
<!-- Boolean indicating associated scan are allowed -->
<bool translatable="false" name="config_wifi_framework_enable_associated_autojoin_scan">true</bool>

View File

@@ -338,6 +338,7 @@
<java-symbol type="integer" name="config_wifi_framework_max_connection_errors_to_blacklist" />
<java-symbol type="integer" name="config_wifi_framework_max_auth_errors_to_blacklist" />
<java-symbol type="integer" name="config_wifi_framework_network_black_list_min_time_milli" />
<java-symbol type="integer" name="config_wifi_framework_current_network_boost" />
<java-symbol type="integer" name="config_bluetooth_max_advertisers" />
<java-symbol type="integer" name="config_bluetooth_max_scan_filters" />
<java-symbol type="integer" name="config_cursorWindowSize" />