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

Commit 76fa374b authored by Nate Jiang's avatar Nate Jiang Committed by Android (Google) Code Review
Browse files

Merge "Add bootstrapping_instance_id to make this value more clear" into main

parents be0551d9 99ce358c

wifi/aidl/default/aidl_struct_util.cpp

+1 −0
Original line number Diff line number Diff line
@@ -3394,6 +3394,7 @@ bool convertAidlNanBootstrappingIndicationResponseToLegacy( 
    *legacy_request = {};



    legacy_request->service_instance_id = aidl_request.bootstrappingInstanceId;

    legacy_request->bootstrapping_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);

wifi/legacy_headers/include/hardware_legacy/wifi_nan.h

+8 −2
Original line number Diff line number Diff line
@@ -2972,11 +2972,17 @@ typedef struct { 
    u16 publish_subscribe_id;



    /*

       This Id is the Peer Instance that is passed as

       part of earlier MatchInd/FollowupInd message.

      Same as the bootstrapping_instance_id

    */

    u32 service_instance_id;



    /*

      Unique Instance Id corresponding to a service/session.

      This is similar to the publish_id generated on the

      publisher side

    */

    u32 bootstrapping_instance_id;



    /* Discovery MAC addr of the peer/initiator */

    u8 peer_disc_mac_addr[NAN_MAC_ADDR_LEN];