Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I847ec3a9,I201b5206

Browse Source 
* changes:
  add HAL PNO config parameter
  add disconnected scan parameter, add bytes[] container to scanResults
This commit is contained in:
Pierre Vandwalle
2015-04-16 18:34:28 +00:00
committed by Android (Google) Code Review
parent a8ac52d6c4 37f6b9307d
commit d10eb9c3eb
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/res/res/values/config.xml
View File

@@ -423,6 +423,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">15000</integer>
<!-- Integer indicating associated partial scan interval in milliseconds -->
<integer translatable="false" name="config_wifi_framework_associated_scan_interval">20000</integer>
@@ -472,6 +475,9 @@
<!-- Wifi driver supports batched scan -->
<bool translatable="false" name="config_wifi_batched_scan_supported">false</bool>
<!-- Wifi HAL supported PNO -->
<bool translatable="false" name="config_wifi_hal_pno_enable">false</bool>
<!-- Idle Receive current for wifi radio. 0 by default-->
<integer translatable="false" name="config_wifi_idle_receive_cur_ma">1</integer>

2
core/res/res/values/symbols.xml
View File

@@ -378,7 +378,9 @@
<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" />
<java-symbol type="integer" name="db_journal_size_limit" />
<java-symbol type="integer" name="db_wal_autocheckpoint" />

6
wifi/java/android/net/wifi/ScanResult.java
View File

@@ -261,6 +261,12 @@ public class ScanResult implements Parcelable {
return freq > 4900 && freq < 5900;
}
/**
* @hide
* storing the raw bytes of full result IEs
**/
public byte[] bytes;
/** information element from beacon
* @hide
*/