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

Commit a79124ca authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "check p_dev before calling callback"

parents 296d92eb 9e7de220

system/btif/src/btif_hh.cc

+11 −3
Original line number Diff line number Diff line
@@ -905,6 +905,12 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) { 


    case BTA_HH_GET_PROTO_EVT:

      p_dev = btif_hh_find_connected_dev_by_handle(p_data->hs_data.handle);

      if (p_dev == NULL) {

        BTIF_TRACE_WARNING(

            "BTA_HH_GET_PROTO_EVT: Error, cannot find device with handle %d",

            p_data->hs_data.handle);

        return;

      }

      BTIF_TRACE_WARNING(

          "BTA_HH_GET_PROTO_EVT: status = %d, handle = %d, proto = [%d], %s",

          p_data->hs_data.status, p_data->hs_data.handle,
@@ -941,9 +947,11 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) { 
          p_data->hs_data.handle, p_data->hs_data.status,

          p_data->hs_data.rsp_data.idle_rate);

      p_dev = btif_hh_find_connected_dev_by_handle(p_data->hs_data.handle);

      if (p_dev) {

        HAL_CBACK(bt_hh_callbacks, idle_time_cb, (RawAddress*)&(p_dev->bd_addr),

                  (bthh_status_t)p_data->hs_data.status,

                  p_data->hs_data.rsp_data.idle_rate);

      }

      break;



    case BTA_HH_SET_IDLE_EVT: