wifi: Make methods deliver status synchronously (1/3) am: 503582ed94
am: 40dac08a47
Change-Id: I9f240491dadbac1cd6770542b35b6d578afba6d9
diff --git a/wifi/1.0/default/wifi.cpp b/wifi/1.0/default/wifi.cpp
index ff2eb4c..e10826b 100644
--- a/wifi/1.0/default/wifi.cpp
+++ b/wifi/1.0/default/wifi.cpp
@@ -18,8 +18,8 @@
#include <android-base/logging.h>
-#include "failure_reason_util.h"
#include "wifi_chip.h"
+#include "wifi_status_util.h"
namespace {
// Chip ID to use for the only supported chip.
@@ -36,9 +36,9 @@
: legacy_hal_(new WifiLegacyHal()), run_state_(RunState::STOPPED) {}
Return<void> Wifi::registerEventCallback(
- const sp<IWifiEventCallback>& callback) {
+ const sp<IWifiEventCallback>& event_callback) {
// TODO(b/31632518): remove the callback when the client is destroyed
- callbacks_.emplace_back(callback);
+ event_callbacks_.emplace_back(event_callback);
return Void();
}
@@ -46,47 +46,44 @@
return run_state_ != RunState::STOPPED;
}
-Return<void> Wifi::start() {
+Return<void> Wifi::start(start_cb hidl_status_cb) {
if (run_state_ == RunState::STARTED) {
- for (const auto& callback : callbacks_) {
- callback->onStart();
- }
+ hidl_status_cb(createWifiStatus(WifiStatusCode::SUCCESS));
return Void();
} else if (run_state_ == RunState::STOPPING) {
- for (const auto& callback : callbacks_) {
- callback->onStartFailure(CreateFailureReason(
- CommandFailureReason::NOT_AVAILABLE, "HAL is stopping"));
- }
+ hidl_status_cb(createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE,
+ "HAL is stopping"));
return Void();
}
LOG(INFO) << "Starting HAL";
- wifi_error status = legacy_hal_->start();
- if (status != WIFI_SUCCESS) {
+ wifi_error legacy_status = legacy_hal_->start();
+ if (legacy_status != WIFI_SUCCESS) {
LOG(ERROR) << "Failed to start Wifi HAL";
- for (auto& callback : callbacks_) {
- callback->onStartFailure(
- CreateFailureReasonLegacyError(status, "Failed to start HAL"));
- }
+ hidl_status_cb(
+ createWifiStatusFromLegacyError(legacy_status, "Failed to start HAL"));
return Void();
}
// Create the chip instance once the HAL is started.
chip_ = new WifiChip(kChipId, legacy_hal_);
run_state_ = RunState::STARTED;
- for (const auto& callback : callbacks_) {
- callback->onStart();
+ for (const auto& callback : event_callbacks_) {
+ if (!callback->onStart().getStatus().isOk()) {
+ LOG(ERROR) << "Failed to invoke onStart callback";
+ };
}
+ hidl_status_cb(createWifiStatus(WifiStatusCode::SUCCESS));
return Void();
}
-Return<void> Wifi::stop() {
+Return<void> Wifi::stop(stop_cb hidl_status_cb) {
if (run_state_ == RunState::STOPPED) {
- for (const auto& callback : callbacks_) {
- callback->onStop();
- }
+ hidl_status_cb(createWifiStatus(WifiStatusCode::SUCCESS));
return Void();
} else if (run_state_ == RunState::STOPPING) {
+ hidl_status_cb(createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE,
+ "HAL is stopping"));
return Void();
}
@@ -98,37 +95,43 @@
}
chip_.clear();
run_state_ = RunState::STOPPED;
- for (const auto& callback : callbacks_) {
- callback->onStop();
+ for (const auto& callback : event_callbacks_) {
+ if (!callback->onStop().getStatus().isOk()) {
+ LOG(ERROR) << "Failed to invoke onStop callback";
+ };
}
};
- wifi_error status = legacy_hal_->stop(on_complete_callback_);
- if (status != WIFI_SUCCESS) {
+ wifi_error legacy_status = legacy_hal_->stop(on_complete_callback_);
+ if (legacy_status != WIFI_SUCCESS) {
LOG(ERROR) << "Failed to stop Wifi HAL";
- for (const auto& callback : callbacks_) {
- callback->onFailure(
- CreateFailureReasonLegacyError(status, "Failed to stop HAL"));
+ WifiStatus wifi_status =
+ createWifiStatusFromLegacyError(legacy_status, "Failed to stop HAL");
+ for (const auto& callback : event_callbacks_) {
+ callback->onFailure(wifi_status);
}
+ hidl_status_cb(wifi_status);
+ return Void();
}
+ hidl_status_cb(createWifiStatus(WifiStatusCode::SUCCESS));
return Void();
}
-Return<void> Wifi::getChipIds(getChipIds_cb cb) {
+Return<void> Wifi::getChipIds(getChipIds_cb hidl_status_cb) {
std::vector<ChipId> chip_ids;
if (chip_.get()) {
chip_ids.emplace_back(kChipId);
}
hidl_vec<ChipId> hidl_data;
hidl_data.setToExternal(chip_ids.data(), chip_ids.size());
- cb(hidl_data);
+ hidl_status_cb(hidl_data);
return Void();
}
-Return<void> Wifi::getChip(ChipId chip_id, getChip_cb cb) {
+Return<void> Wifi::getChip(ChipId chip_id, getChip_cb hidl_status_cb) {
if (chip_.get() && chip_id == kChipId) {
- cb(chip_);
+ hidl_status_cb(chip_);
} else {
- cb(nullptr);
+ hidl_status_cb(nullptr);
}
return Void();
}
diff --git a/wifi/1.0/default/wifi.h b/wifi/1.0/default/wifi.h
index 55ba12b..989b630 100644
--- a/wifi/1.0/default/wifi.h
+++ b/wifi/1.0/default/wifi.h
@@ -41,12 +41,12 @@
// HIDL methods exposed.
Return<void> registerEventCallback(
- const sp<IWifiEventCallback>& callback) override;
+ const sp<IWifiEventCallback>& event_callback) override;
Return<bool> isStarted() override;
- Return<void> start() override;
- Return<void> stop() override;
- Return<void> getChipIds(getChipIds_cb cb) override;
- Return<void> getChip(ChipId chip_id, getChip_cb cb) override;
+ Return<void> start(start_cb hidl_status_cb) override;
+ Return<void> stop(stop_cb hidl_status_cb) override;
+ Return<void> getChipIds(getChipIds_cb hidl_status_cb) override;
+ Return<void> getChip(ChipId chip_id, getChip_cb hidl_status_cb) override;
private:
enum class RunState { STOPPED, STARTED, STOPPING };
@@ -55,7 +55,7 @@
// and shared with all the child HIDL interface objects.
std::shared_ptr<WifiLegacyHal> legacy_hal_;
RunState run_state_;
- std::vector<sp<IWifiEventCallback>> callbacks_;
+ std::vector<sp<IWifiEventCallback>> event_callbacks_;
sp<WifiChip> chip_;
DISALLOW_COPY_AND_ASSIGN(Wifi);