Merge "wifi(implementation): Remove unnecessary local variable" into oc-mr1-dev

am: 12d6df4a2a

Change-Id: Id89af05cf256af7b4a6958c502a7f8a683901084
This commit is contained in:
Roshan Pius 2017-09-05 22:53:56 +00:00 committed by android-build-merger
commit d956fb10e5

View file

@ -185,9 +185,8 @@ WifiStatus Wifi::initializeLegacyHal() {
WifiStatus Wifi::stopLegacyHalAndDeinitializeModeController( WifiStatus Wifi::stopLegacyHalAndDeinitializeModeController(
/* NONNULL */ std::unique_lock<std::recursive_mutex>* lock) { /* NONNULL */ std::unique_lock<std::recursive_mutex>* lock) {
run_state_ = RunState::STOPPING; run_state_ = RunState::STOPPING;
const auto on_complete_callback_ = [&]() { run_state_ = RunState::STOPPED; };
legacy_hal::wifi_error legacy_status = legacy_hal::wifi_error legacy_status =
legacy_hal_->stop(lock, on_complete_callback_); legacy_hal_->stop(lock, [&]() { run_state_ = RunState::STOPPED; });
if (legacy_status != legacy_hal::WIFI_SUCCESS) { if (legacy_status != legacy_hal::WIFI_SUCCESS) {
LOG(ERROR) << "Failed to stop legacy HAL: " LOG(ERROR) << "Failed to stop legacy HAL: "
<< legacyErrorToString(legacy_status); << legacyErrorToString(legacy_status);