Merge "[HAL] Invalidate chip before shutting down legacy HAL" into oc-dr1-dev

This commit is contained in:
Etan Cohen
2017-07-21 03:18:16 +00:00
committed by Android (Google) Code Review

View File

@@ -126,6 +126,12 @@ WifiStatus Wifi::stopInternal() {
return createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE,
"HAL is stopping");
}
// Clear the chip object and its child objects since the HAL is now
// stopped.
if (chip_.get()) {
chip_->invalidate();
chip_.clear();
}
WifiStatus wifi_status = stopLegacyHalAndDeinitializeModeController();
if (wifi_status.code == WifiStatusCode::SUCCESS) {
for (const auto& callback : event_cb_handler_.getCallbacks()) {
@@ -140,12 +146,6 @@ WifiStatus Wifi::stopInternal() {
}
}
}
// 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;
}