From d34e3a7b98d51f684100483151fceb233fd95215 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 11 Mar 2016 08:44:38 -0800 Subject: Update ScanCapabilities in WifiNative BUG: 27607839 Change-Id: I8edb1b7637fa69b3ba1ee59e52d2e1c5a6e79c9e TEST:Compiles & unit-test passes --- service/java/com/android/server/wifi/WifiNative.java | 4 ++++ service/jni/com_android_server_wifi_WifiNative.cpp | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'service') 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; } -- cgit v1.2.3