tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
am: 9cec7f6dab

Change-Id: Ie148f86f04c574de69eea10135362078c37b156d
This commit is contained in:
Etan Cohen 2017-07-21 03:21:43 +00:00 committed by android-build-merger
commit b1e419bb2e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
wifi/1.1/default/wifi.cpp
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;
}