stack::sdp::SDP_SetLocalDiRecord Use proper return tSDP_STATUS

Bug: 352926289
Test: m .
Flag: EXEMPT, Data type narrowing

Change-Id: I57bc003c342f786e734d919e37c5916f8788b283

5 files changed, 11 insertions, 9 deletions

diff --git a/system/stack/include/sdp_api.h b/system/stack/include/sdp_api.h
index 6b9ffa0188..1441bc2b97 100644
--- a/system/stack/include/sdp_api.h
+++ b/system/stack/include/sdp_api.h
@@ -504,8 +504,8 @@ struct tSdpApi {
                        error
 
      ******************************************************************************/
-    [[nodiscard]] uint16_t (*SDP_SetLocalDiRecord)(const tSDP_DI_RECORD* device_info,
-                                                   uint32_t* p_handle);
+    [[nodiscard]] tSDP_STATUS (*SDP_SetLocalDiRecord)(const tSDP_DI_RECORD* device_info,
+                                                      uint32_t* p_handle);
 
     /*******************************************************************************
 
diff --git a/system/stack/sdp/internal/sdp_api.h b/system/stack/sdp/internal/sdp_api.h
index ad34eade63..78e9a1c767 100644
--- a/system/stack/sdp/internal/sdp_api.h
+++ b/system/stack/sdp/internal/sdp_api.h
@@ -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);
 
 /*******************************************************************************
  *
diff --git a/system/stack/sdp/sdp_api.cc b/system/stack/sdp/sdp_api.cc
index 0ffa420aa6..a1b343a07e 100644
--- a/system/stack/sdp/sdp_api.cc
+++ b/system/stack/sdp/sdp_api.cc
@@ -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;
diff --git a/system/test/mock/mock_stack_sdp_api.cc b/system/test/mock/mock_stack_sdp_api.cc
index 0a4c58f2a7..100af05d5e 100644
--- a/system/test/mock/mock_stack_sdp_api.cc
+++ b/system/test/mock/mock_stack_sdp_api.cc
@@ -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);
 }
diff --git a/system/test/mock/mock_stack_sdp_api.h b/system/test/mock/mock_stack_sdp_api.h
index 8c5c0c9641..ddc10e3f81 100644
--- a/system/test/mock/mock_stack_sdp_api.h
+++ b/system/test/mock/mock_stack_sdp_api.h
@@ -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);
   }
 };