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

Commit 6f0e4466 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Revert "Defer free in bta_hh_act.cc" am: 65e154c9 

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



Change-Id: I7e7c803343034a1d5984a98727ecbb7b3129f34b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a593131e 65e154c9

system/bta/hh/bta_hh_act.cc

+1 −5
Original line number Original line Diff line number Diff line
@@ -705,7 +705,6 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { 
  BT_HDR* pdata = p_data->hid_cback.p_data;

  BT_HDR* pdata = p_data->hid_cback.p_data;

  uint8_t* data = (uint8_t*)(pdata + 1) + pdata->offset;

  uint8_t* data = (uint8_t*)(pdata + 1) + pdata->offset;

  tBTA_HH_HSDATA hs_data;

  tBTA_HH_HSDATA hs_data;

  bool do_free = true;





  APPL_TRACE_DEBUG("Ctrl DATA received w4: event[%s]",

  APPL_TRACE_DEBUG("Ctrl DATA received w4: event[%s]",

                   bta_hh_get_w4_event(p_cb->w4_evt));

                   bta_hh_get_w4_event(p_cb->w4_evt));
@@ -726,7 +725,6 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { 
      hs_data.rsp_data.p_rpt_data = pdata;

      hs_data.rsp_data.p_rpt_data = pdata;

      bta_hh_co_get_rpt_rsp(hs_data.handle, hs_data.status, pdata->data,

      bta_hh_co_get_rpt_rsp(hs_data.handle, hs_data.status, pdata->data,

                            pdata->len);

                            pdata->len);

      do_free = false;

      break;

      break;

    case BTA_HH_GET_PROTO_EVT:

    case BTA_HH_GET_PROTO_EVT:

      /* match up BTE/BTA report/boot mode def*/

      /* match up BTE/BTA report/boot mode def*/
@@ -758,10 +756,8 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { 
  (*bta_hh_cb.p_cback)(p_cb->w4_evt, (tBTA_HH*)&hs_data);

  (*bta_hh_cb.p_cback)(p_cb->w4_evt, (tBTA_HH*)&hs_data);





  p_cb->w4_evt = 0;

  p_cb->w4_evt = 0;

  if (do_free) {

  osi_free_and_reset((void**)&pdata);

  osi_free_and_reset((void**)&pdata);

}

}

}





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

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

 *

 *

system/btif/src/btif_hh.cc

+0 −4
Original line number Original line Diff line number Diff line
@@ -906,10 +906,6 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) { 
        BTIF_TRACE_WARNING("Error: cannot find device with handle %d",

        BTIF_TRACE_WARNING("Error: cannot find device with handle %d",

                           p_data->hs_data.handle);

                           p_data->hs_data.handle);

      }

      }

      if (hdr) {

        osi_free(hdr);

        p_data->hs_data.rsp_data.p_rpt_data = NULL;

      }

      break;

      break;

    }

    }