diff options
| author | Pierre Vandwalle <vandwalle@google.com> | 2015-04-16 00:24:04 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-04-16 00:24:05 +0000 |
| commit | 66143cacd8bf240701b0a1e4880fe7257a3e83c0 (patch) | |
| tree | de21444dd239195a95393f00256898b87df5995d | |
| parent | 3031bf961103ecc1caa32449a3cdb95575042278 (diff) | |
| parent | 127217a340681c6cae53667d9514631c5812dd16 (diff) | |
| download | frameworks_base-66143cacd8bf240701b0a1e4880fe7257a3e83c0.zip frameworks_base-66143cacd8bf240701b0a1e4880fe7257a3e83c0.tar.gz frameworks_base-66143cacd8bf240701b0a1e4880fe7257a3e83c0.tar.bz2 | |
Merge "add disconnected scan parameter, add bytes[] container to scanResults" into m-wireless-dev
| -rwxr-xr-x | core/res/res/values/config.xml | 3 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 1 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/ScanResult.java | 6 |
3 files changed, 10 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f1da2f9..4b28aab 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -437,6 +437,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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index b274c15..76556ad 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -371,6 +371,7 @@ <java-symbol type="integer" name="config_triplePressOnPowerBehavior" /> <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="integer" name="db_connection_pool_size" /> <java-symbol type="integer" name="db_journal_size_limit" /> diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java index e8a51e3..5dc70bd 100644 --- a/wifi/java/android/net/wifi/ScanResult.java +++ b/wifi/java/android/net/wifi/ScanResult.java @@ -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 */ |