commit 09258a2afbd022b5d4ebc6c8f7d540ac2fff5429
author Roshan Pius <rpius@google.com> Wed Mar 08 00:33:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 08 00:33:44 2017 +0000
tree 5affd3970a0f3e888ade2fc22949b9559bb21961
parent 96b3cce92cfbfac3980b3bc3368cfddd8d35bfa3
parent f12f1ee288c75a93511d99d8d7a72ea162727d27

Merge "wifi(implementation): Clear the chip immediately on IWifi.stop()"

wifi/1.0/default/wifi.cpp

diff --git a/wifi/1.0/default/wifi.cpp b/wifi/1.0/default/wifi.cpp
index 3d482b4..b48844e 100644
--- a/wifi/1.0/default/wifi.cpp
+++ b/wifi/1.0/default/wifi.cpp
@@ -115,6 +115,7 @@
       }
     }
   }
+  LOG(INFO) << "Wifi HAL started";
   return wifi_status;
 }
 
@@ -139,6 +140,13 @@
       }
     }
   }
+  // Clear the chip object and its child objects since the HAL is now
+  // stopped.
+  if (chip_.get()) {
+    chip_->invalidate();
+    chip_.clear();
+  }
+  LOG(INFO) << "Wifi HAL stopped";
   return wifi_status;
 }
 
@@ -172,13 +180,7 @@
 
 WifiStatus Wifi::stopLegacyHalAndDeinitializeModeController() {
   run_state_ = RunState::STOPPING;
-  const auto on_complete_callback_ = [&]() {
-    if (chip_.get()) {
-      chip_->invalidate();
-    }
-    chip_.clear();
-    run_state_ = RunState::STOPPED;
-  };
+  const auto on_complete_callback_ = [&]() { run_state_ = RunState::STOPPED; };
   legacy_hal::wifi_error legacy_status =
       legacy_hal_->stop(on_complete_callback_);
   if (legacy_status != legacy_hal::WIFI_SUCCESS) {