summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2017-01-03 17:06:57 -0800
committerSteven Moreland <smoreland@google.com>2017-01-04 10:40:05 -0800
commitb6438421923590b765905efe151e26129dce4094 (patch)
treef80ccca80838fb5e40d900165fc73d7d6c314a7f /wifi
parent5bf8664c7e0c6bf746d724ee1f07d98fa14f0cf2 (diff)
downloadandroid_hardware_interfaces-b6438421923590b765905efe151e26129dce4094.tar.gz
android_hardware_interfaces-b6438421923590b765905efe151e26129dce4094.tar.bz2
android_hardware_interfaces-b6438421923590b765905efe151e26129dce4094.zip
Return<*> getStatus().isOk() -> isOk()
Bug: 31348667 Test: compiles Change-Id: If8d5a23f80dbc04127635b49f1ef77398fc9f8a1
Diffstat (limited to 'wifi')
-rw-r--r--wifi/1.0/default/wifi.cpp10
-rw-r--r--wifi/1.0/default/wifi_nan_iface.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/wifi/1.0/default/wifi.cpp b/wifi/1.0/default/wifi.cpp
index 332363de6..c06abe8fe 100644
--- a/wifi/1.0/default/wifi.cpp
+++ b/wifi/1.0/default/wifi.cpp
@@ -103,18 +103,18 @@ WifiStatus Wifi::startInternal() {
chip_ = new WifiChip(kChipId, legacy_hal_, mode_controller_);
run_state_ = RunState::STARTED;
for (const auto& callback : event_callbacks_) {
- if (!callback->onStart().getStatus().isOk()) {
+ if (!callback->onStart().isOk()) {
LOG(ERROR) << "Failed to invoke onStart callback";
};
}
for (const auto& callback : event_callbacks_) {
- if (!callback->onFailure(wifi_status).getStatus().isOk()) {
+ if (!callback->onFailure(wifi_status).isOk()) {
LOG(ERROR) << "Failed to invoke onFailure callback";
}
}
} else {
for (const auto& callback : event_callbacks_) {
- if (!callback->onFailure(wifi_status).getStatus().isOk()) {
+ if (!callback->onFailure(wifi_status).isOk()) {
LOG(ERROR) << "Failed to invoke onFailure callback";
}
}
@@ -132,13 +132,13 @@ WifiStatus Wifi::stopInternal() {
WifiStatus wifi_status = stopLegacyHalAndDeinitializeModeController();
if (wifi_status.code == WifiStatusCode::SUCCESS) {
for (const auto& callback : event_callbacks_) {
- if (!callback->onStop().getStatus().isOk()) {
+ if (!callback->onStop().isOk()) {
LOG(ERROR) << "Failed to invoke onStop callback";
};
}
} else {
for (const auto& callback : event_callbacks_) {
- if (!callback->onFailure(wifi_status).getStatus().isOk()) {
+ if (!callback->onFailure(wifi_status).isOk()) {
LOG(ERROR) << "Failed to invoke onFailure callback";
}
}
diff --git a/wifi/1.0/default/wifi_nan_iface.cpp b/wifi/1.0/default/wifi_nan_iface.cpp
index a89752087..8d5cbc9f1 100644
--- a/wifi/1.0/default/wifi_nan_iface.cpp
+++ b/wifi/1.0/default/wifi_nan_iface.cpp
@@ -59,7 +59,7 @@ WifiNanIface::WifiNanIface(
hidl_msg.header = hidl_header;
hidl_msg.body = hidl_body;
for (const auto& callback : event_callbacks_) {
- if (!callback->notifyPublishResponse(id, hidl_msg).getStatus().isOk()) {
+ if (!callback->notifyPublishResponse(id, hidl_msg).isOk()) {
LOG(ERROR) << "Failed to invoke the callback";
}
}