Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1e419bb authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

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

am: 9cec7f6d

Change-Id: Ie148f86f04c574de69eea10135362078c37b156d
parents 4d360f63 9cec7f6d

wifi/1.1/default/wifi.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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;

}