Add NAN session suspension in shim layer.
Bug: 259950106
Test: m android.hardware.wifi-update-api
Change-Id: Ia3c1aa7e709e4e611bf40757ae712a9e39cc043a
diff --git a/wifi/aidl/default/tests/wifi_nan_iface_unit_tests.cpp b/wifi/aidl/default/tests/wifi_nan_iface_unit_tests.cpp
index f81cab3..878c29b 100644
--- a/wifi/aidl/default/tests/wifi_nan_iface_unit_tests.cpp
+++ b/wifi/aidl/default/tests/wifi_nan_iface_unit_tests.cpp
@@ -134,6 +134,8 @@
ndk::ScopedAStatus(char16_t, const NanStatus&, int32_t));
MOCK_METHOD2(notifyRespondToBootstrappingIndicationResponse,
ndk::ScopedAStatus(char16_t, const NanStatus&));
+ MOCK_METHOD2(notifySuspendResponse, ndk::ScopedAStatus(char16_t, const NanStatus&));
+ MOCK_METHOD2(notifyResumeResponse, ndk::ScopedAStatus(char16_t, const NanStatus&));
};
class WifiNanIfaceTest : public Test {
diff --git a/wifi/aidl/default/wifi_legacy_hal.cpp b/wifi/aidl/default/wifi_legacy_hal.cpp
index f03835f..0711568 100644
--- a/wifi/aidl/default/wifi_legacy_hal.cpp
+++ b/wifi/aidl/default/wifi_legacy_hal.cpp
@@ -1559,6 +1559,22 @@
return status;
}
+wifi_error WifiLegacyHal::nanSuspendRequest(const std::string& iface_name, transaction_id id,
+ const NanSuspendRequest& msg) {
+ NanSuspendRequest msg_internal(msg);
+ wifi_error status = global_func_table_.wifi_nan_suspend_request(id, getIfaceHandle(iface_name),
+ &msg_internal);
+ return status;
+}
+
+wifi_error WifiLegacyHal::nanResumeRequest(const std::string& iface_name, transaction_id id,
+ const NanResumeRequest& msg) {
+ NanResumeRequest msg_internal(msg);
+ wifi_error status = global_func_table_.wifi_nan_resume_request(id, getIfaceHandle(iface_name),
+ &msg_internal);
+ return status;
+}
+
wifi_error WifiLegacyHal::setCountryCode(const std::string& iface_name,
const std::array<uint8_t, 2> code) {
std::string code_str(code.data(), code.data() + code.size());
diff --git a/wifi/aidl/default/wifi_legacy_hal.h b/wifi/aidl/default/wifi_legacy_hal.h
index 2300cb7..1e6ef73 100644
--- a/wifi/aidl/default/wifi_legacy_hal.h
+++ b/wifi/aidl/default/wifi_legacy_hal.h
@@ -165,12 +165,14 @@
using ::NanRangeReportInd;
using ::NanRangeRequestInd;
using ::NanResponseMsg;
+using ::NanResumeRequest;
using ::NanSRFType;
using ::NanStatusType;
using ::NanSubscribeCancelRequest;
using ::NanSubscribeRequest;
using ::NanSubscribeTerminatedInd;
using ::NanSubscribeType;
+using ::NanSuspendRequest;
using ::NanTransmitFollowupInd;
using ::NanTransmitFollowupRequest;
using ::NanTxType;
@@ -701,6 +703,10 @@
wifi_error nanBootstrappingIndicationResponse(const std::string& iface_name, transaction_id id,
const NanBootstrappingIndicationResponse& msg);
wifi_error nanDataEnd(const std::string& iface_name, transaction_id id, uint32_t ndpInstanceId);
+ wifi_error nanSuspendRequest(const std::string& iface_name, transaction_id id,
+ const NanSuspendRequest& msg);
+ wifi_error nanResumeRequest(const std::string& iface_name, transaction_id id,
+ const NanResumeRequest& msg);
// AP functions.
wifi_error setCountryCode(const std::string& iface_name, const std::array<uint8_t, 2> code);
diff --git a/wifi/aidl/default/wifi_legacy_hal_stubs.cpp b/wifi/aidl/default/wifi_legacy_hal_stubs.cpp
index 11da373..c18b086 100644
--- a/wifi/aidl/default/wifi_legacy_hal_stubs.cpp
+++ b/wifi/aidl/default/wifi_legacy_hal_stubs.cpp
@@ -173,6 +173,8 @@
populateStubFor(&hal_fn->wifi_get_cached_scan_results);
populateStubFor(&hal_fn->wifi_get_chip_capabilities);
populateStubFor(&hal_fn->wifi_enable_sta_channel_for_peer_network);
+ populateStubFor(&hal_fn->wifi_nan_suspend_request);
+ populateStubFor(&hal_fn->wifi_nan_resume_request);
return true;
}
diff --git a/wifi/aidl/default/wifi_nan_iface.cpp b/wifi/aidl/default/wifi_nan_iface.cpp
index ce6902d..7138e41 100644
--- a/wifi/aidl/default/wifi_nan_iface.cpp
+++ b/wifi/aidl/default/wifi_nan_iface.cpp
@@ -756,6 +756,16 @@
in_msg);
}
+ndk::ScopedAStatus WifiNanIface::suspendRequest(char16_t in_cmdId, int8_t in_sessionId) {
+ return validateAndCall(this, WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
+ &WifiNanIface::suspendRequestInternal, in_cmdId, in_sessionId);
+}
+
+ndk::ScopedAStatus WifiNanIface::resumeRequest(char16_t in_cmdId, int8_t in_sessionId) {
+ return validateAndCall(this, WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
+ &WifiNanIface::resumeRequestInternal, in_cmdId, in_sessionId);
+}
+
std::pair<std::string, ndk::ScopedAStatus> WifiNanIface::getNameInternal() {
return {ifname_, ndk::ScopedAStatus::ok()};
}
@@ -930,7 +940,20 @@
legacy_hal_.lock()->nanBootstrappingIndicationResponse(ifname_, cmd_id, legacy_msg);
return createWifiStatusFromLegacyError(legacy_status);
}
-
+ndk::ScopedAStatus WifiNanIface::suspendRequestInternal(char16_t cmd_id, int8_t sessionId) {
+ legacy_hal::NanSuspendRequest legacy_msg;
+ legacy_msg.publish_subscribe_id = sessionId;
+ legacy_hal::wifi_error legacy_status =
+ legacy_hal_.lock()->nanSuspendRequest(ifname_, cmd_id, legacy_msg);
+ return createWifiStatusFromLegacyError(legacy_status);
+}
+ndk::ScopedAStatus WifiNanIface::resumeRequestInternal(char16_t cmd_id, int8_t sessionId) {
+ legacy_hal::NanResumeRequest legacy_msg;
+ legacy_msg.publish_subscribe_id = sessionId;
+ legacy_hal::wifi_error legacy_status =
+ legacy_hal_.lock()->nanResumeRequest(ifname_, cmd_id, legacy_msg);
+ return createWifiStatusFromLegacyError(legacy_status);
+}
} // namespace wifi
} // namespace hardware
} // namespace android
diff --git a/wifi/aidl/default/wifi_nan_iface.h b/wifi/aidl/default/wifi_nan_iface.h
index 591eca9..3b93c28 100644
--- a/wifi/aidl/default/wifi_nan_iface.h
+++ b/wifi/aidl/default/wifi_nan_iface.h
@@ -86,6 +86,8 @@
const NanBootstrappingRequest& in_msg) override;
ndk::ScopedAStatus respondToBootstrappingIndicationRequest(
char16_t in_cmdId, const NanBootstrappingResponse& in_msg) override;
+ ndk::ScopedAStatus suspendRequest(char16_t in_cmdId, int8_t sessionId) override;
+ ndk::ScopedAStatus resumeRequest(char16_t in_cmdId, int8_t sessionId) override;
protected:
// Accessible to child class in the gTest suite.
@@ -127,6 +129,8 @@
const NanBootstrappingRequest& msg);
ndk::ScopedAStatus respondToBootstrappingIndicationRequestInternal(
char16_t cmd_id, const NanBootstrappingResponse& msg);
+ ndk::ScopedAStatus suspendRequestInternal(char16_t in_cmdId, int8_t sessionId);
+ ndk::ScopedAStatus resumeRequestInternal(char16_t in_cmdId, int8_t sessionId);
// Overridden in the gTest suite.
virtual std::set<std::shared_ptr<IWifiNanIfaceEventCallback>> getEventCallbacks();
diff --git a/wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp b/wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp
index 654eb02..ae5040f 100644
--- a/wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp
+++ b/wifi/aidl/vts/functional/wifi_nan_iface_aidl_test.cpp
@@ -104,6 +104,8 @@
NOTIFY_RESPOND_TO_PAIRING_INDICATION_RESPONSE,
NOTIFY_INITIATE_BOOTSTRAPPING_RESPONSE,
NOTIFY_RESPOND_TO_BOOTSTRAPPING_INDICATION_RESPONSE,
+ NOTIFY_SUSPEND_RESPONSE,
+ NOTIFY_RESUME_RESPONSE,
EVENT_CLUSTER_EVENT,
EVENT_DISABLED,
@@ -358,6 +360,20 @@
parent_.notify();
return ndk::ScopedAStatus::ok();
}
+ ::ndk::ScopedAStatus notifySuspendResponse(char16_t id, const NanStatus& status) override {
+ parent_.callback_type_ = NOTIFY_SUSPEND_RESPONSE;
+ parent_.id_ = id;
+ parent_.status_ = status;
+ parent_.notify();
+ return ndk::ScopedAStatus::ok();
+ }
+ ::ndk::ScopedAStatus notifyResumeResponse(char16_t id, const NanStatus& status) override {
+ parent_.callback_type_ = NOTIFY_RESUME_RESPONSE;
+ parent_.id_ = id;
+ parent_.status_ = status;
+ parent_.notify();
+ return ndk::ScopedAStatus::ok();
+ }
::ndk::ScopedAStatus notifyTransmitFollowupResponse(char16_t id,
const NanStatus& status) override {
parent_.callback_type_ = NOTIFY_TRANSMIT_FOLLOWUP_RESPONSE;