stack::sdp::SDP_GetDiRecord Use proper return type

Bug: 352845847
Test: m .
Flag: EXEMPT, Proper Return Typing

Change-Id: I95aeb08bc6e92a5f8c5643e03f6c98bb2f7f5d43

6 files changed, 16 insertions, 16 deletions

diff --git a/system/stack/include/sdp_api.h b/system/stack/include/sdp_api.h
index 1441bc2b97..cf1bce4e0d 100644
--- a/system/stack/include/sdp_api.h
+++ b/system/stack/include/sdp_api.h
@@ -559,9 +559,9 @@ struct tSdpApi {
       Returns          SDP_SUCCESS if record retrieved, else error
 
      ******************************************************************************/
-    [[nodiscard]] uint16_t (*SDP_GetDiRecord)(uint8_t getRecordIndex,
-                                              tSDP_DI_GET_RECORD* device_info,
-                                              const tSDP_DISCOVERY_DB* p_db);
+    [[nodiscard]] tSDP_STATUS (*SDP_GetDiRecord)(uint8_t getRecordIndex,
+                                                 tSDP_DI_GET_RECORD* device_info,
+                                                 const tSDP_DISCOVERY_DB* p_db);
 
   } device_id;
 };
diff --git a/system/stack/sdp/internal/sdp_api.h b/system/stack/sdp/internal/sdp_api.h
index 78e9a1c767..85e34bfb4a 100644
--- a/system/stack/sdp/internal/sdp_api.h
+++ b/system/stack/sdp/internal/sdp_api.h
@@ -420,5 +420,5 @@ uint8_t SDP_GetNumDiRecords(const tSDP_DISCOVERY_DB* p_db);
  * Returns          SDP_SUCCESS if record retrieved, else error
  *
  ******************************************************************************/
-uint16_t SDP_GetDiRecord(uint8_t getRecordIndex, tSDP_DI_GET_RECORD* device_info,
-                         const tSDP_DISCOVERY_DB* p_db);
+tSDP_STATUS SDP_GetDiRecord(uint8_t getRecordIndex, tSDP_DI_GET_RECORD* device_info,
+                            const tSDP_DISCOVERY_DB* p_db);
diff --git a/system/stack/sdp/sdp_api.cc b/system/stack/sdp/sdp_api.cc
index a1b343a07e..90a8f8afc9 100644
--- a/system/stack/sdp/sdp_api.cc
+++ b/system/stack/sdp/sdp_api.cc
@@ -824,9 +824,9 @@ static void SDP_AttrStringCopy(char* dst, const tSDP_DISC_ATTR* p_attr, uint16_t
  * Returns          SDP_SUCCESS if record retrieved, else error
  *
  ******************************************************************************/
-uint16_t SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,
-                         const tSDP_DISCOVERY_DB* p_db) {
-  uint16_t result = SDP_NO_DI_RECORD_FOUND;
+tSDP_STATUS SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,
+                            const tSDP_DISCOVERY_DB* p_db) {
+  tSDP_STATUS result = SDP_NO_DI_RECORD_FOUND;
   uint8_t curr_record_index = 1;
 
   tSDP_DISC_REC* p_curr_record = NULL;
diff --git a/system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h b/system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h
index 7c91f6490c..5d9327069d 100644
--- a/system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h
+++ b/system/stack/test/fuzzers/sdp/sdpFuzzFunctions.h
@@ -306,7 +306,7 @@ static const std::vector<std::function<void(FuzzedDataProvider*)>> sdp_operation
         // ::SDP_GetDiRecord
         [](FuzzedDataProvider* fdp) -> void {
           tSDP_DI_GET_RECORD device_info;  // Output var
-          [[maybe_unused]] bool rc = get_legacy_stack_sdp_api()->device_id.SDP_GetDiRecord(
+          [[maybe_unused]] tSDP_STATUS rc = get_legacy_stack_sdp_api()->device_id.SDP_GetDiRecord(
                   fdp->ConsumeIntegral<uint8_t>(), &device_info,
                   getArbitraryVectorElement(fdp, sdp_db_vect, true).get());
         },
diff --git a/system/test/mock/mock_stack_sdp_api.cc b/system/test/mock/mock_stack_sdp_api.cc
index 100af05d5e..3eac310775 100644
--- a/system/test/mock/mock_stack_sdp_api.cc
+++ b/system/test/mock/mock_stack_sdp_api.cc
@@ -130,8 +130,8 @@ tSDP_STATUS SDP_DiDiscover(const RawAddress& remote_device, tSDP_DISCOVERY_DB* p
   inc_func_call_count(__func__);
   return test::mock::stack_sdp_api::SDP_DiDiscover(remote_device, p_db, len, p_cb);
 }
-uint16_t SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,
-                         const tSDP_DISCOVERY_DB* p_db) {
+tSDP_STATUS SDP_GetDiRecord(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,
+                            const tSDP_DISCOVERY_DB* p_db) {
   inc_func_call_count(__func__);
   return test::mock::stack_sdp_api::SDP_GetDiRecord(get_record_index, p_device_info, p_db);
 }
diff --git a/system/test/mock/mock_stack_sdp_api.h b/system/test/mock/mock_stack_sdp_api.h
index ddc10e3f81..da0f277cda 100644
--- a/system/test/mock/mock_stack_sdp_api.h
+++ b/system/test/mock/mock_stack_sdp_api.h
@@ -222,12 +222,12 @@ extern struct SDP_DiDiscover SDP_DiDiscover;
 // Params: uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,
 // tSDP_DISCOVERY_DB* p_db Returns: uint16_t
 struct SDP_GetDiRecord {
-  std::function<uint16_t(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,
-                         const tSDP_DISCOVERY_DB* p_db)>
+  std::function<tSDP_STATUS(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,
+                            const tSDP_DISCOVERY_DB* p_db)>
           body{[](uint8_t /* get_record_index */, tSDP_DI_GET_RECORD* /* p_device_info */,
-                  const tSDP_DISCOVERY_DB* /* p_db */) { return 0; }};
-  uint16_t operator()(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,
-                      const tSDP_DISCOVERY_DB* p_db) {
+                  const tSDP_DISCOVERY_DB* /* p_db */) { return SDP_SUCCESS; }};
+  tSDP_STATUS operator()(uint8_t get_record_index, tSDP_DI_GET_RECORD* p_device_info,
+                         const tSDP_DISCOVERY_DB* p_db) {
     return body(get_record_index, p_device_info, p_db);
   }
 };