Modify based on the vendor feedback
- Add end pairing request method
- Handle bootstrapping comeback event
- Add cipher type in the pairing request
Bug: 265075699
Test: cts sinlgeDeviceTest
Change-Id: Ic744b0a1098e258b68caba5a9a33b2bef3226b40
diff --git a/wifi/aidl/default/wifi_legacy_hal.h b/wifi/aidl/default/wifi_legacy_hal.h
index a066ea6..468d8d7 100644
--- a/wifi/aidl/default/wifi_legacy_hal.h
+++ b/wifi/aidl/default/wifi_legacy_hal.h
@@ -36,7 +36,6 @@
namespace legacy_hal {
// Import all the types defined inside the legacy HAL header files into this
// namespace.
-using ::Akm;
using ::chre_nan_rtt_state;
using ::frame_info;
using ::frame_type;
@@ -68,6 +67,7 @@
using ::NAN_MATCH_ALG_MATCH_CONTINUOUS;
using ::NAN_MATCH_ALG_MATCH_NEVER;
using ::NAN_MATCH_ALG_MATCH_ONCE;
+using ::NAN_PAIRING_END;
using ::NAN_PAIRING_INITIATOR_RESPONSE;
using ::NAN_PAIRING_RESPONDER_RESPONSE;
using ::NAN_PAIRING_SETUP;
@@ -125,6 +125,7 @@
using ::NAN_TX_TYPE_BROADCAST;
using ::NAN_TX_TYPE_UNICAST;
using ::NAN_USE_SRF;
+using ::NanAkm;
using ::NanBeaconSdfPayloadInd;
using ::NanBootstrappingConfirmInd;
using ::NanBootstrappingIndicationResponse;
@@ -152,6 +153,7 @@
using ::NanMatchInd;
using ::NanPairingConfig;
using ::NanPairingConfirmInd;
+using ::NanPairingEndRequest;
using ::NanPairingIndicationResponse;
using ::NanPairingRequest;
using ::NanPairingRequestInd;
@@ -703,6 +705,7 @@
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 nanPairingEnd(const std::string& iface_name, transaction_id id, uint32_t pairingId);
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,