Merge "Return<*> getStatus().isOk() -> isOk()" (3131b6fc) · Commits · e / os / android_hardware_interfaces

wifi/1.0/default/wifi.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -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";
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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";
		}
		}