From 47214cddd58954b0176247419459b155659a5739 Mon Sep 17 00:00:00 2001
From: Zach Johnson <zachoverflow@google.com>
Date: Fri, 28 Aug 2020 15:14:27 -0700
Subject: [PATCH] Simplify BTA_SdpCreate/RemoveRecordByUser

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I27826c96110cf9c3b533a26275cb7eb22edc1dcf
---
 bta/sdp/bta_sdp_act.cc | 12 ++++--------
 bta/sdp/bta_sdp_api.cc | 22 ++--------------------
 bta/sdp/bta_sdp_int.h  | 28 ++--------------------------
 3 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/bta/sdp/bta_sdp_act.cc b/bta/sdp/bta_sdp_act.cc
index c435d795b..52e091a3c 100644
--- a/bta/sdp/bta_sdp_act.cc
+++ b/bta/sdp/bta_sdp_act.cc
@@ -481,11 +481,9 @@ void bta_sdp_search(const RawAddress bd_addr, const bluetooth::Uuid uuid) {
  * Returns      void
  *
  ******************************************************************************/
-void bta_sdp_create_record(tBTA_SDP_API_RECORD_USER* p_data) {
+void bta_sdp_create_record(void* user_data) {
   if (bta_sdp_cb.p_dm_cback)
-    bta_sdp_cb.p_dm_cback(BTA_SDP_CREATE_RECORD_USER_EVT, NULL,
-                          p_data->user_data);
-  osi_free(p_data);
+    bta_sdp_cb.p_dm_cback(BTA_SDP_CREATE_RECORD_USER_EVT, NULL, user_data);
 }
 
 /*******************************************************************************
@@ -497,9 +495,7 @@ void bta_sdp_create_record(tBTA_SDP_API_RECORD_USER* p_data) {
  * Returns      void
  *
  ******************************************************************************/
-void bta_sdp_remove_record(tBTA_SDP_API_RECORD_USER* p_data) {
+void bta_sdp_remove_record(void* user_data) {
   if (bta_sdp_cb.p_dm_cback)
-    bta_sdp_cb.p_dm_cback(BTA_SDP_REMOVE_RECORD_USER_EVT, NULL,
-                          p_data->user_data);
-  osi_free(p_data);
+    bta_sdp_cb.p_dm_cback(BTA_SDP_REMOVE_RECORD_USER_EVT, NULL, user_data);
 }
diff --git a/bta/sdp/bta_sdp_api.cc b/bta/sdp/bta_sdp_api.cc
index 61b92849b..231d3ec3b 100644
--- a/bta/sdp/bta_sdp_api.cc
+++ b/bta/sdp/bta_sdp_api.cc
@@ -93,16 +93,7 @@ tBTA_SDP_STATUS BTA_SdpSearch(const RawAddress& bd_addr,
  *
  ******************************************************************************/
 tBTA_SDP_STATUS BTA_SdpCreateRecordByUser(void* user_data) {
-  tBTA_SDP_API_RECORD_USER* p_msg =
-      (tBTA_SDP_API_RECORD_USER*)osi_malloc(sizeof(tBTA_SDP_API_RECORD_USER));
-
-  APPL_TRACE_API("%s", __func__);
-
-  p_msg->hdr.event = BTA_SDP_API_CREATE_RECORD_USER_EVT;
-  p_msg->user_data = user_data;
-
-  do_in_main_thread(FROM_HERE, base::Bind(bta_sdp_create_record, p_msg));
-
+  do_in_main_thread(FROM_HERE, base::Bind(bta_sdp_create_record, user_data));
   return BTA_SDP_SUCCESS;
 }
 
@@ -119,15 +110,6 @@ tBTA_SDP_STATUS BTA_SdpCreateRecordByUser(void* user_data) {
  *
  ******************************************************************************/
 tBTA_SDP_STATUS BTA_SdpRemoveRecordByUser(void* user_data) {
-  tBTA_SDP_API_RECORD_USER* p_msg =
-      (tBTA_SDP_API_RECORD_USER*)osi_malloc(sizeof(tBTA_SDP_API_RECORD_USER));
-
-  APPL_TRACE_API("%s", __func__);
-
-  p_msg->hdr.event = BTA_SDP_API_REMOVE_RECORD_USER_EVT;
-  p_msg->user_data = user_data;
-
-  do_in_main_thread(FROM_HERE, base::Bind(bta_sdp_remove_record, p_msg));
-
+  do_in_main_thread(FROM_HERE, base::Bind(bta_sdp_remove_record, user_data));
   return BTA_SDP_SUCCESS;
 }
diff --git a/bta/sdp/bta_sdp_int.h b/bta/sdp/bta_sdp_int.h
index 72a69ad97..e85e444a3 100644
--- a/bta/sdp/bta_sdp_int.h
+++ b/bta/sdp/bta_sdp_int.h
@@ -36,32 +36,10 @@
  ****************************************************************************/
 
 enum {
-  /* these events are handled by the state machine */
-  BTA_SDP_API_ENABLE_EVT = BTA_SYS_EVT_START(BTA_ID_SDP),
-  BTA_SDP_API_SEARCH_EVT,
-  BTA_SDP_API_CREATE_RECORD_USER_EVT,
-  BTA_SDP_API_REMOVE_RECORD_USER_EVT,
-  BTA_SDP_MAX_INT_EVT
-};
-
-enum {
   BTA_SDP_ACTIVE_NONE = 0,
   BTA_SDP_ACTIVE_YES /* waiting for SDP result */
 };
 
-/* data type for BTA_SDP_API_SEARCH_EVT */
-typedef struct {
-  BT_HDR hdr;
-  void* user_data;
-} tBTA_SDP_API_RECORD_USER;
-
-/* union of all data types */
-typedef union {
-  /* GKI event buffer header */
-  BT_HDR hdr;
-  tBTA_SDP_API_RECORD_USER record;
-} tBTA_SDP_MSG;
-
 /* SDP control block */
 typedef struct {
   uint8_t sdp_active; /* see BTA_SDP_SDP_ACT_* */
@@ -75,12 +53,10 @@ extern tBTA_SDP_CB bta_sdp_cb;
 /* config struct */
 extern tBTA_SDP_CFG* p_bta_sdp_cfg;
 
-extern bool bta_sdp_sm_execute(BT_HDR* p_msg);
-
 extern void bta_sdp_enable(tBTA_SDP_DM_CBACK* p_cback);
 extern void bta_sdp_search(const RawAddress bd_addr,
                            const bluetooth::Uuid uuid);
-extern void bta_sdp_create_record(tBTA_SDP_API_RECORD_USER* p_data);
-extern void bta_sdp_remove_record(tBTA_SDP_API_RECORD_USER* p_data);
+extern void bta_sdp_create_record(void* user_data);
+extern void bta_sdp_remove_record(void* user_data);
 
 #endif /* BTA_SDP_INT_H */
-- 
2.11.0