am a40265e..7ab5189 from mirror-m-wireless-internal-release

7ab5189 Merge "Make autojoin parameters configurable" into m-wireless-dev
7ff782a Make autojoin parameters configurable
f49a59b Issue start/stop HAL along with load/unload driver
cbda71c Merge "make WiFi No Network Periodic Scans Interval to 5 minutes Bug:21274132" into m-wireless-dev
c538878 make WiFi No Network Periodic Scans Interval to 5 minutes Bug:21274132

1 files changed, 6 insertions, 2 deletions

diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index d36b5f16b..40f41ba3f 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -357,8 +357,11 @@ static void android_net_wifi_stopHal(JNIEnv* env, jclass cls) {
     ALOGD("In wifi stop Hal");
 
     wifi_handle halHandle = getWifiHandle(env, cls);
+    if (halHandle == NULL)
+        return;
+
+    ALOGD("halHandle = %p, mVM = %p, mCls = %p", halHandle, mVM, mCls);
     hal_fn.wifi_cleanup(halHandle, android_net_wifi_hal_cleaned_up_handler);
-    set_iface_flags("wlan0", 0);
 }
 
 static void android_net_wifi_waitForHalEvents(JNIEnv* env, jclass cls) {
@@ -367,6 +370,7 @@ static void android_net_wifi_waitForHalEvents(JNIEnv* env, jclass cls) {
 
     wifi_handle halHandle = getWifiHandle(env, cls);
     hal_fn.wifi_event_loop(halHandle);
+    set_iface_flags("wlan0", 0);
 }
 
 static int android_net_wifi_getInterfaces(JNIEnv *env, jclass cls) {
@@ -1955,7 +1959,7 @@ static jboolean android_net_wifi_setPnoListNative(
 static jboolean android_net_wifi_setLazyRoam(
         JNIEnv *env, jclass cls, jint iface, jint id, jboolean enabled, jobject roam_param)  {
 
-    jboolean status = true;
+    wifi_error status = WIFI_SUCCESS;
     wifi_roam_params params;
     memset(&params, 0, sizeof(params));