Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7ec0384 authored by Nate Jiang's avatar Nate Jiang
Browse files

Add discovery session in the bootstrapping request and respond 

Bug: 292462023
Test: atest SingleDeviceTest
Change-Id: I8ec57f5f2af14ccb546c452b82c62652c43f0d4e
parent e81e181c

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBootstrappingRequest.aidl

+2 −0
Original line number Diff line number Diff line
@@ -38,4 +38,6 @@ parcelable NanBootstrappingRequest { 
  byte[6] peerDiscMacAddr;

  android.hardware.wifi.NanBootstrappingMethod requestBootstrappingMethod;

  byte[] cookie;

  boolean isComeback;

  byte discoverySessionId;

}

wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBootstrappingResponse.aidl

+1 −0
Original line number Diff line number Diff line
@@ -36,4 +36,5 @@ package android.hardware.wifi; 
parcelable NanBootstrappingResponse {

  int bootstrappingInstanceId;

  boolean acceptRequest;

  byte discoverySessionId;

}

wifi/aidl/android/hardware/wifi/NanBootstrappingRequest.aidl

+12 −0
Original line number Diff line number Diff line
@@ -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;

}

wifi/aidl/android/hardware/wifi/NanBootstrappingResponse.aidl

+7 −0
Original line number Diff line number Diff line
@@ -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;

}

wifi/aidl/default/aidl_struct_util.cpp

+3 −0
Original line number Diff line number Diff line
@@ -3202,6 +3202,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;

}
@@ -3219,6 +3221,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;

}