commit bdeabd1dc52144a305118d30c01448a0e438b6b0
author Brian Delwiche <delwiche@google.com> Fri Sep 30 18:59:56 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 30 18:59:56 2022 +0000
tree 77fc2c62dc02a7d5b2968fae9011599ab3e1caa3
parent 4a3af816ef08f0c71aa3893a1d2596373346b60f
parent 456915e0f082584cf4faf8322f9636676e0764bf

Merge "Revert "Defer free in bta_hh_act.cc"" into qt-dev am: 456915e0f0

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/20086293

Change-Id: I7f24a26bf909cae648e6ce62b0db2ab0a26635c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bta/hh/bta_hh_act.cc

diff --git a/bta/hh/bta_hh_act.cc b/bta/hh/bta_hh_act.cc
index d2b3ba2..f64fbf0 100644
--- a/bta/hh/bta_hh_act.cc
+++ b/bta/hh/bta_hh_act.cc
@@ -718,7 +718,6 @@
   BT_HDR* pdata = p_data->hid_cback.p_data;
   uint8_t* data = (uint8_t*)(pdata + 1) + pdata->offset;
   tBTA_HH_HSDATA hs_data;
-  bool do_free = true;
 
 #if (BTA_HH_DEBUG == TRUE)
   APPL_TRACE_DEBUG("Ctrl DATA received w4: event[%s]",
@@ -741,7 +740,6 @@
       hs_data.rsp_data.p_rpt_data = pdata;
       bta_hh_co_get_rpt_rsp(hs_data.handle, hs_data.status, pdata->data,
                             pdata->len);
-      do_free = false;
       break;
     case BTA_HH_GET_PROTO_EVT:
       /* match up BTE/BTA report/boot mode def*/
@@ -777,9 +775,7 @@
   (*bta_hh_cb.p_cback)(p_cb->w4_evt, (tBTA_HH*)&hs_data);
 
   p_cb->w4_evt = 0;
-  if (do_free) {
-    osi_free_and_reset((void**)&pdata);
-  }
+  osi_free_and_reset((void**)&pdata);
 }
 
 /*******************************************************************************

btif/src/btif_hh.cc

diff --git a/btif/src/btif_hh.cc b/btif/src/btif_hh.cc
index 11c09e3..650923a 100644
--- a/btif/src/btif_hh.cc
+++ b/btif/src/btif_hh.cc
@@ -891,10 +891,6 @@
         BTIF_TRACE_WARNING("Error: cannot find device with handle %d",
                            p_data->hs_data.handle);
       }
-      if (hdr) {
-        osi_free(hdr);
-        p_data->hs_data.rsp_data.p_rpt_data = NULL;
-      }
       break;
     }