hal based Pno and lazy roam implementation

Change-Id: Ib814ff6d29c8d7f1b579f7c088cd4eb104e5b637

1 files changed, 12 insertions, 9 deletions

diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index beefce57d..5a937cacb 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -87,11 +87,11 @@ int init_wifi_hal_func_table(wifi_hal_fn *hal_fn) {
     hal_fn->wifi_get_logger_supported_feature_set = wifi_get_logger_supported_feature_set_stub;
     hal_fn->wifi_get_ring_data = wifi_get_ring_data_stub;
     hal_fn->wifi_get_driver_version = wifi_get_driver_version_stub;
-    hal_fn->wifi_set_ssid_white_list = wifi_set_ssid_white_list;
-    hal_fn->wifi_set_gscan_roam_params = wifi_set_gscan_roam_params;
-    hal_fn->wifi_set_bssid_preference = wifi_set_bssid_preference;
-    hal_fn->wifi_enable_lazy_roam = wifi_enable_lazy_roam;
-    hal_fn->wifi_set_bssid_blacklist = wifi_set_bssid_blacklist;
+    hal_fn->wifi_set_ssid_white_list = wifi_set_ssid_white_list_stub;
+    hal_fn->wifi_set_gscan_roam_params = wifi_set_gscan_roam_params_stub;
+    hal_fn->wifi_set_bssid_preference = wifi_set_bssid_preference_stub;
+    hal_fn->wifi_enable_lazy_roam = wifi_enable_lazy_roam_stub;
+    hal_fn->wifi_set_bssid_blacklist = wifi_set_bssid_blacklist_stub;
     return 0;
 }
 
@@ -1696,6 +1696,7 @@ static void on_alert_data(wifi_request_id id, char *buffer, int buffer_size, int
     }
 }
 
+
 static jboolean android_net_wifi_start_logging_ring_buffer(JNIEnv *env, jclass cls, jint iface,
         jint verbose_level,jint flags, jint max_interval,jint min_data_size, jstring ring_name) {
 
@@ -1887,7 +1888,7 @@ static jboolean android_net_wifi_setPnoListNative(
         // stop pno
         int result = hal_fn.wifi_set_epno_list(id, handle, 0, NULL, handler);
         ALOGE(" setPnoListNative: STOP result = %d", result);
-        return result;
+        return result >= 0;
     }
 
     wifi_epno_network net_list[MAX_PNO_SSID];
@@ -1972,12 +1973,14 @@ static jboolean android_net_wifi_setLazyRoam(
         params.alert_roam_rssi_trigger = getIntField(env, roam_param, "alert_roam_rssi_trigger");
         status = hal_fn.wifi_set_gscan_roam_params(id, handle, &params);
     }
-    if (status) {
+    ALOGE("android_net_wifi_setLazyRoam configured params status=%d\n", status);
+
+    if (status >= 0) {
         int doEnable = enabled ? 1 : 0;
         status = hal_fn.wifi_enable_lazy_roam(id, handle, doEnable);
+        ALOGE("android_net_wifi_setLazyRoam enabled roam status=%d\n", status);
     }
-    ALOGE("android_net_wifi_setLazyRoam\n");
-    return status;
+    return status >= 0;
 }
 
 // ----------------------------------------------------------------------------