diff options
| author | vandwalle <vandwalle@google.com> | 2014-09-12 23:34:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-12 23:34:29 +0000 |
| commit | 8ca1f18abf14382f8554101af4ba7d2657f364b2 (patch) | |
| tree | e4eb97f7bc3bdf907721a052642959cefc9adeee /core | |
| parent | c0595a7d7d2e3c893452168296c41b4f38989bac (diff) | |
| parent | 94fe7e99d1e99a6bb351da48a8e17b1d61b0efdc (diff) | |
| download | frameworks_base-8ca1f18abf14382f8554101af4ba7d2657f364b2.zip frameworks_base-8ca1f18abf14382f8554101af4ba7d2657f364b2.tar.gz frameworks_base-8ca1f18abf14382f8554101af4ba7d2657f364b2.tar.bz2 | |
Merge "various fixes:" into lmp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/config.xml | 33 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 16 |
2 files changed, 47 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 3907fc5..7599bf4 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -339,6 +339,22 @@ capability can provide power savings when wifi needs to be always kept on. --> <bool translatable="false" name="config_wifi_background_scan_support">false</bool> + <!-- Boolean indicating we re-try re-associating once upon disconnection and RSSI is high failure --> + <bool translatable="true" name="config_wifi_enable_disconnection_debounce">true</bool> + + <!-- Boolean indicating autojoin will prefer 5GHz and choose 5GHz BSSIDs --> + <bool translatable="true" name="config_wifi_enable_5GHz_preference">true</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> + <integer translatable="false" name="config_wifi_framework_current_association_hysteresis_high">16</integer> + <integer translatable="false" name="config_wifi_framework_current_association_hysteresis_low">10</integer> + <integer translatable="false" name="config_wifi_framework_5GHz_preference_penalty_threshold">-75</integer> + <integer translatable="false" name="config_wifi_framework_5GHz_preference_penalty_factor">2</integer> + + + <!-- Integer indicating wpa_supplicant scan interval in milliseconds --> <integer translatable="false" name="config_wifi_supplicant_scan_interval">15000</integer> @@ -351,9 +367,24 @@ 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 associated scan interval in milliseconds --> + <!-- Integer indicating associated partial scan interval in milliseconds --> <integer translatable="false" name="config_wifi_framework_associated_scan_interval">10000</integer> + <!-- Integer indicating associated full scan backoff, representing a fraction: xx/8 --> + <integer translatable="false" name="config_wifi_framework_associated_full_scan_backoff">12</integer> + + <!-- Integer indicating associated full scan max interval in milliseconds --> + <integer translatable="false" name="config_wifi_framework_associated_full_scan_max_interval">300000</integer> + + <!-- Integer indicating associated full scan max total dwell time in milliseconds --> + <integer translatable="false" name="config_wifi_framework_associated_full_scan_max_total_dwell_time">500</integer> + + <!-- Integer indicating associated full scan max num active channels --> + <integer translatable="false" name="config_wifi_framework_associated_partial_scan_max_num_active_channels">6</integer> + + <!-- Integer indicating associated full scan max num passive channels --> + <integer translatable="false" name="config_wifi_framework_associated_partial_scan_max_num_passive_channels">3</integer> + <!-- Boolean indicating associated scan are allowed --> <bool translatable="false" name="config_wifi_framework_enable_associated_autojoin_scan">true</bool> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 117e235..d69a0f2 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -297,6 +297,21 @@ <java-symbol type="bool" name="config_wifi_framework_enable_associated_autojoin_scan" /> <java-symbol type="bool" name="config_wifi_framework_enable_associated_network_selection" /> <java-symbol type="bool" name="config_wifi_only_link_same_credential_configurations" /> + <java-symbol type="bool" name="config_wifi_enable_disconnection_debounce" /> + <java-symbol type="bool" name="config_wifi_enable_5GHz_preference" /> + <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_threshold" /> + <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_boost_factor" /> + <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_threshold" /> + <java-symbol type="integer" name="config_wifi_framework_current_association_hysteresis_high" /> + <java-symbol type="integer" name="config_wifi_framework_current_association_hysteresis_low" /> + <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_threshold" /> + <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_factor" /> + <java-symbol type="integer" name="config_wifi_framework_associated_scan_interval" /> + <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_backoff" /> + <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_max_interval" /> + <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_max_total_dwell_time" /> + <java-symbol type="integer" name="config_wifi_framework_associated_partial_scan_max_num_active_channels" /> + <java-symbol type="integer" name="config_wifi_framework_associated_partial_scan_max_num_passive_channels" /> <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" /> @@ -315,7 +330,6 @@ <java-symbol type="integer" name="config_shortPressOnPowerBehavior" /> <java-symbol type="integer" name="config_toastDefaultGravity" /> <java-symbol type="integer" name="config_wifi_framework_scan_interval" /> - <java-symbol type="integer" name="config_wifi_framework_associated_scan_interval" /> <java-symbol type="integer" name="config_wifi_supplicant_scan_interval" /> <java-symbol type="integer" name="config_wifi_scan_interval_p2p_connected" /> <java-symbol type="integer" name="db_connection_pool_size" /> |