diff options
| author | Roshan Pius <rpius@google.com> | 2016-03-11 21:22:10 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2016-03-11 21:22:10 +0000 |
| commit | 9b34eab6963479d468e6ab7859c3721b2d1e17f8 (patch) | |
| tree | 735d16284f7ceeb9f905e8310b7ba1fa5a703dde /service | |
| parent | ea91131081772e97c65581b9a290dee21ee79a83 (diff) | |
| parent | d34e3a7b98d51f684100483151fceb233fd95215 (diff) | |
Merge "Update ScanCapabilities in WifiNative" into mm-wireless-dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNative.java | 4 | ||||
| -rw-r--r-- | service/jni/com_android_server_wifi_WifiNative.cpp | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java index 1103a3ccd..aa93831ec 100644 --- a/service/java/com/android/server/wifi/WifiNative.java +++ b/service/java/com/android/server/wifi/WifiNative.java @@ -1814,6 +1814,10 @@ public class WifiNative { public int max_scan_reporting_threshold; public int max_hotlist_bssids; public int max_significant_wifi_change_aps; + public int max_bssid_history_entries; + public int max_number_epno_networks; + public int max_number_epno_networks_by_ssid; + public int max_number_of_white_listed_ssid; } public boolean getScanCapabilities(ScanCapabilities capabilities) { diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp index f6d82908c..41053b723 100644 --- a/service/jni/com_android_server_wifi_WifiNative.cpp +++ b/service/jni/com_android_server_wifi_WifiNative.cpp @@ -626,7 +626,13 @@ static jboolean android_net_wifi_getScanCapabilities( helper.setIntField(capabilities, "max_scan_reporting_threshold", c.max_scan_reporting_threshold); helper.setIntField(capabilities, "max_hotlist_bssids", c.max_hotlist_bssids); helper.setIntField(capabilities, "max_significant_wifi_change_aps", - c.max_significant_wifi_change_aps); + c.max_significant_wifi_change_aps); + helper.setIntField(capabilities, "max_bssid_history_entries", c.max_bssid_history_entries); + helper.setIntField(capabilities, "max_number_epno_networks", c.max_number_epno_networks); + helper.setIntField(capabilities, "max_number_epno_networks_by_ssid", + c.max_number_epno_networks_by_ssid); + helper.setIntField(capabilities, "max_number_of_white_listed_ssid", + c.max_number_of_white_listed_ssid); return JNI_TRUE; } |