Do not start/stop the driver in HAL startandroid-n-mr1-preview-2android-n-mr1-preview-1

The framework expects to control the state of the driver.  The HAL
should not be touching it.  This code is also a noop on all supported
nexi, where the driver is always started.

Bug: 29321445
Change-Id: If431b278222ca06a29232874bd0c9870bd0be785
Test: Compiles, wifi continues to work on bullhead
(cherry picked from commit 236a52b136b7fdd802389ef1687bd3df37c1adb6)

1 files changed, 0 insertions, 14 deletions

diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp
index 49bf2b4..c8082cb 100644
--- a/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/qcwcn/wifi_hal/wifi_hal.cpp
@@ -42,8 +42,6 @@
 
 #define LOG_TAG  "WifiHAL"
 
-#include "hardware_legacy/wifi.h"
-
 #include "wifi_hal.h"
 #include "common.h"
 #include "cpp_bindings.h"
@@ -368,7 +366,6 @@ wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn) {
 wifi_error wifi_initialize(wifi_handle *handle)
 {
     int err = 0;
-    bool driver_loaded = false;
     wifi_error ret = WIFI_SUCCESS;
     wifi_interface_handle iface_handle;
     struct nl_sock *cmd_sock = NULL;
@@ -477,15 +474,6 @@ wifi_error wifi_initialize(wifi_handle *handle)
         goto unload;
     }
 
-    if (!is_wifi_driver_loaded()) {
-        ret = (wifi_error)wifi_load_driver();
-        if(ret != WIFI_SUCCESS) {
-            ALOGE("%s Failed to load wifi driver : %d\n", __func__, ret);
-            goto unload;
-        }
-        driver_loaded = true;
-    }
-
     ret = wifi_init_interfaces(*handle);
     if (ret != WIFI_SUCCESS) {
         ALOGE("Failed to init interfaces");
@@ -590,8 +578,6 @@ unload:
         }
     }
 
-    if (driver_loaded)
-        wifi_unload_driver();
     return ret;
 }