diff options
| author | xin He <xinhe@google.com> | 2015-05-18 22:11:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-18 22:11:18 +0000 |
| commit | 7e11579ba02741071129f1ac57aa25e771f0c9bd (patch) | |
| tree | e93cbcc1c438255c7a8fa5b7f1154aed64159647 /core/res | |
| parent | 9354a3ac006001b10c3a3de59737798034794c89 (diff) | |
| parent | 358673e275ed065fadb04c1722ac458e6c617a89 (diff) | |
| download | frameworks_base-7e11579ba02741071129f1ac57aa25e771f0c9bd.zip frameworks_base-7e11579ba02741071129f1ac57aa25e771f0c9bd.tar.gz frameworks_base-7e11579ba02741071129f1ac57aa25e771f0c9bd.tar.bz2 | |
Merge "hal based pno and lazy roam implementation" into mnc-dev
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/config.xml | 14 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 6 |
2 files changed, 14 insertions, 6 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index a4c7a3e..f790d74 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -423,11 +423,17 @@ 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">15000</integer> + <!-- Integer indicating disconnect mode short scan interval in milliseconds --> + <integer translatable="false" name="config_wifi_disconnected_short_scan_interval">15000</integer> - <!-- Integer indicating associated partial scan interval in milliseconds --> - <integer translatable="false" name="config_wifi_framework_associated_scan_interval">20000</integer> + <!-- Integer indicating disconnect mode long scan interval in milliseconds --> + <integer translatable="false" name="config_wifi_disconnected_long_scan_interval">120000</integer> + + <!-- Integer indicating associated partial scan short interval in milliseconds --> + <integer translatable="false" name="config_wifi_associated_short_scan_interval">20000</integer> + + <!-- Integer indicating associated partial scan long interval in milliseconds --> + <integer translatable="false" name="config_wifi_associated_long_scan_interval">180000</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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a24d7f3..dee34cc 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -310,7 +310,10 @@ <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_disconnected_short_scan_interval" /> + <java-symbol type="integer" name="config_wifi_disconnected_long_scan_interval" /> + <java-symbol type="integer" name="config_wifi_associated_short_scan_interval" /> + <java-symbol type="integer" name="config_wifi_associated_long_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" /> @@ -380,7 +383,6 @@ <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="bool" name="config_wifi_hal_pno_enable" /> <java-symbol type="integer" name="db_connection_pool_size" /> |