Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add discovery session in the bootstrapping request and respond" into main

Browse Source
This commit is contained in:
Nate Jiang
2023-12-08 19:15:09 +00:00
committed by Android (Google) Code Review
parent 6391202a3b b7ec0384da
commit 4dbabdd0ef
5 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBootstrappingRequest.aidl
View File

@@ -38,4 +38,6 @@ parcelable NanBootstrappingRequest {
byte[6] peerDiscMacAddr;
android.hardware.wifi.NanBootstrappingMethod requestBootstrappingMethod;
byte[] cookie;
boolean isComeback;
byte discoverySessionId;
}

1
wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBootstrappingResponse.aidl
View File

@@ -36,4 +36,5 @@ package android.hardware.wifi;
parcelable NanBootstrappingResponse {
int bootstrappingInstanceId;
boolean acceptRequest;
byte discoverySessionId;
}

12
wifi/aidl/android/hardware/wifi/NanBootstrappingRequest.aidl
View File

@@ -45,4 +45,16 @@ parcelable NanBootstrappingRequest {
* Cookie received from previous |NanBootstrappingConfirmInd| for comeback request.
*/
byte[] cookie;
/**
* Identify if it is a request for come back response
*/
boolean isComeback;
/**
* ID of an active publish or subscribe discovery session. Follow-up message is transmitted in
* the context of the discovery session. NAN Spec: Service Descriptor Attribute (SDA) / Instance
* ID
*/
byte discoverySessionId;
}

7
wifi/aidl/android/hardware/wifi/NanBootstrappingResponse.aidl
View File

@@ -29,4 +29,11 @@ parcelable NanBootstrappingResponse {
* True if accept the request, false otherwise.
*/
boolean acceptRequest;
/**
* ID of an active publish or subscribe discovery session. Follow-up message is transmitted in
* the context of the discovery session. NAN Spec: Service Descriptor Attribute (SDA) / Instance
* ID
*/
byte discoverySessionId;
}

3
wifi/aidl/default/aidl_struct_util.cpp
View File

@@ -3205,6 +3205,8 @@ bool convertAidlNanBootstrappingInitiatorRequestToLegacy(
legacy_request->cookie_length = aidl_request.cookie.size();
memcpy(legacy_request->cookie, aidl_request.cookie.data(), legacy_request->cookie_length);
legacy_request->publish_subscribe_id = static_cast<uint8_t>(aidl_request.discoverySessionId);
legacy_request->comeback = aidl_request.isComeback ? 0x1 : 0x0;
return true;
}
@@ -3222,6 +3224,7 @@ bool convertAidlNanBootstrappingIndicationResponseToLegacy(
legacy_request->service_instance_id = aidl_request.bootstrappingInstanceId;
legacy_request->rsp_code = aidl_request.acceptRequest ? NAN_BOOTSTRAPPING_REQUEST_ACCEPT
: NAN_BOOTSTRAPPING_REQUEST_REJECT;
legacy_request->publish_subscribe_id = static_cast<uint8_t>(aidl_request.discoverySessionId);
return true;
}