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

Commit 60db0586 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "stack::sdp::SDP_SetLocalDiRecord Use proper return tSDP_STATUS" into... 

Merge "stack::sdp::SDP_SetLocalDiRecord Use proper return tSDP_STATUS" into main am: 86e07c8e am: 139a3ecd

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3170964



Change-Id: If96ed0fefd472121c182787c2c44f74e3bf78f06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0267cb32 139a3ecd

system/stack/include/sdp_api.h

+2 −2
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ struct tSdpApi { 
                       error



     ******************************************************************************/

    [[nodiscard]] uint16_t (*SDP_SetLocalDiRecord)(const tSDP_DI_RECORD* device_info,

    [[nodiscard]] tSDP_STATUS (*SDP_SetLocalDiRecord)(const tSDP_DI_RECORD* device_info,

                                                      uint32_t* p_handle);



    /*******************************************************************************

system/stack/sdp/internal/sdp_api.h

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ bool SDP_AddServiceClassIdList(uint32_t handle, uint16_t num_services, uint16_t* 
 * Returns          Returns SDP_SUCCESS if record added successfully, else error

 *

 ******************************************************************************/

uint16_t SDP_SetLocalDiRecord(const tSDP_DI_RECORD* device_info, uint32_t* p_handle);

tSDP_STATUS SDP_SetLocalDiRecord(const tSDP_DI_RECORD* device_info, uint32_t* p_handle);



/*******************************************************************************

 *

system/stack/sdp/sdp_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -929,8 +929,8 @@ uint16_t SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_ 
 * Returns          Returns SDP_SUCCESS if record added successfully, else error

 *

 ******************************************************************************/

uint16_t SDP_SetLocalDiRecord(const tSDP_DI_RECORD* p_device_info, uint32_t* p_handle) {

  uint16_t result = SDP_SUCCESS;

tSDP_STATUS SDP_SetLocalDiRecord(const tSDP_DI_RECORD* p_device_info, uint32_t* p_handle) {

  tSDP_STATUS result = SDP_SUCCESS;

  uint32_t handle;

  uint16_t di_uuid = UUID_SERVCLASS_PNP_INFORMATION;

  uint16_t di_specid = BLUETOOTH_DI_SPECIFICATION;

system/test/mock/mock_stack_sdp_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ uint16_t SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_ 
  inc_func_call_count(__func__);

  return test::mock::stack_sdp_api::SDP_GetDiRecord(get_record_index, p_device_info, p_db);

}

uint16_t SDP_SetLocalDiRecord(const tSDP_DI_RECORD* p_device_info, uint32_t* p_handle) {

tSDP_STATUS SDP_SetLocalDiRecord(const tSDP_DI_RECORD* p_device_info, uint32_t* p_handle) {

  inc_func_call_count(__func__);

  return test::mock::stack_sdp_api::SDP_SetLocalDiRecord(p_device_info, p_handle);

}

system/test/mock/mock_stack_sdp_api.h

+5 −3
Original line number Diff line number Diff line
@@ -236,9 +236,11 @@ extern struct SDP_GetDiRecord SDP_GetDiRecord; 
// Params: tSDP_DI_RECORD* p_device_info, uint32_t* p_handle

// Returns: uint16_t

struct SDP_SetLocalDiRecord {

  std::function<uint16_t(const tSDP_DI_RECORD* p_device_info, uint32_t* p_handle)> body{

          [](const tSDP_DI_RECORD* /* p_device_info */, uint32_t* /* p_handle */) { return 0; }};

  uint16_t operator()(const tSDP_DI_RECORD* p_device_info, uint32_t* p_handle) {

  std::function<tSDP_STATUS(const tSDP_DI_RECORD* p_device_info, uint32_t* p_handle)> body{

          [](const tSDP_DI_RECORD* /* p_device_info */, uint32_t* /* p_handle */) {

            return SDP_SUCCESS;

          }};

  tSDP_STATUS operator()(const tSDP_DI_RECORD* p_device_info, uint32_t* p_handle) {

    return body(p_device_info, p_handle);

  }

};