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

Commit 49e3d437 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9127121 from c75ca11a to tm-qpr1-release 

Change-Id: I5caf7f30e822b16fb216bbd9f6662fbf18504cf6
parents f036b612 c75ca11a

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+4 −0
Original line number Diff line number Diff line
@@ -5081,6 +5081,7 @@ public class AdapterService extends Service { 
    private static final String GD_LINK_POLICY_FLAG = "INIT_gd_link_policy";

    private static final String GATT_ROBUST_CACHING_CLIENT_FLAG = "INIT_gatt_robust_caching_client";

    private static final String GATT_ROBUST_CACHING_SERVER_FLAG = "INIT_gatt_robust_caching_server";

    private static final String IRK_ROTATION_FLAG = "INIT_irk_rotation";



    /**

     * Logging flags logic (only applies to DEBUG and VERBOSE levels):
@@ -5141,6 +5142,9 @@ public class AdapterService extends Service { 
                GATT_ROBUST_CACHING_SERVER_FLAG, false)) {

            initFlags.add(String.format("%s=%s", GATT_ROBUST_CACHING_SERVER_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH, IRK_ROTATION_FLAG, false)) {

            initFlags.add(String.format("%s=%s", IRK_ROTATION_FLAG, "true"));

        }

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_BLUETOOTH,

                LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, false)) {

            initFlags.add(String.format("%s=%s", LOGGING_DEBUG_ENABLED_FOR_ALL_FLAG, "true"));

system/bta/hh/bta_hh_act.cc

+1 −5
Original line number Diff line number Diff line
@@ -706,7 +706,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;

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

  tBTA_HH_HSDATA hs_data;

  bool do_free = true;



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

                   bta_hh_get_w4_event(p_cb->w4_evt));
@@ -727,7 +726,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;

      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*/
@@ -759,10 +757,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);



  p_cb->w4_evt = 0;

  if (do_free) {

  osi_free_and_reset((void**)&pdata);

}

}



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

 *

system/btif/src/btif_hh.cc

+0 −4
Original line number Diff line number Diff line
@@ -893,10 +893,6 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) { 
        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;

    }