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

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

Re-log bta/../LOG_ am: 920fee2c 

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

Change-Id: Iaaa87f772fa6ae6b03ec317636ab582dcbda3f69
parents ceca9d92 920fee2c

system/bta/av/bta_av_act.cc

+1 −2
Original line number Diff line number Diff line
@@ -305,8 +305,7 @@ static void bta_av_rc_msg_cback(uint8_t handle, uint8_t label, uint8_t opcode, 
uint8_t bta_av_rc_create(tBTA_AV_CB* p_cb, uint8_t role, uint8_t shdl,

                         uint8_t lidx) {

  if (is_new_avrcp_enabled()) {

    APPL_TRACE_WARNING("%s: Skipping RC creation for the old AVRCP profile",

                       __func__);

    LOG_DEBUG("Skipping RC creation for the old AVRCP profile");

    return BTA_AV_RC_HANDLE_NONE;

  }

system/bta/dm/bta_dm_act.cc

+7 −10
Original line number Diff line number Diff line
@@ -434,8 +434,7 @@ void bta_dm_disable() { 
     * shutdown by

     * BTA_DISABLE_DELAY milliseconds

     */

    APPL_TRACE_WARNING("%s BTA_DISABLE_DELAY set to %d ms", __func__,

                       BTA_DISABLE_DELAY);

    LOG_WARN("BTA_DISABLE_DELAY set to %d ms", BTA_DISABLE_DELAY);

    alarm_set_on_mloop(bta_dm_cb.disable_timer, BTA_DISABLE_DELAY,

                       bta_dm_disable_conn_down_timer_cback, NULL);

#else
@@ -2382,8 +2381,8 @@ static void bta_dm_check_av() { 
  uint8_t i;

  tBTA_DM_PEER_DEVICE* p_dev;



  APPL_TRACE_WARNING("bta_dm_check_av:%d", bta_dm_cb.cur_av_count);

  if (bta_dm_cb.cur_av_count) {

    LOG_INFO("av_count:%d", bta_dm_cb.cur_av_count);

    for (i = 0; i < bta_dm_cb.device_list.count; i++) {

      p_dev = &bta_dm_cb.device_list.peer_device[i];

      APPL_TRACE_WARNING("[%d]: state:%d, info:x%x", i, p_dev->conn_state,
@@ -2721,7 +2720,7 @@ static void bta_dm_set_eir(char* local_name) { 


  memset(p, 0x00, HCI_EXT_INQ_RESPONSE_LEN);



  APPL_TRACE_DEBUG("BTA is generating EIR");

  LOG_DEBUG("Generating extended inquiry response packet EIR");



  if (local_name)

    local_name_len = strlen(local_name);
@@ -3022,19 +3021,17 @@ void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding) { 
  if (!BTM_HasEirService(p_bta_dm_eir_cfg->uuid_mask, uuid16)) return;



  if (adding) {

    APPL_TRACE_EVENT("Adding UUID=0x%04X into EIR", uuid16);

    LOG_DEBUG("EIR Adding UUID=0x%04X into extended inquiry response", uuid16);



    BTM_AddEirService(bta_dm_cb.eir_uuid, uuid16);

  } else {

    APPL_TRACE_EVENT("Removing UUID=0x%04X from EIR", uuid16);

    LOG_DEBUG("EIR Removing UUID=0x%04X from extended inquiry response",

              uuid16);



    BTM_RemoveEirService(bta_dm_cb.eir_uuid, uuid16);

  }



  bta_dm_set_eir(NULL);



  APPL_TRACE_EVENT("bta_dm_eir_update_uuid UUID bit mask=0x%08X %08X",

                   bta_dm_cb.eir_uuid[1], bta_dm_cb.eir_uuid[0]);

}

#endif
@@ -3534,7 +3531,7 @@ void bta_dm_ble_observe(bool start, uint8_t duration, 
void bta_dm_ble_set_data_length(const RawAddress& bd_addr,

                                uint16_t tx_data_length) {

  if (BTM_SetBleDataLength(bd_addr, tx_data_length) != BTM_SUCCESS) {

    APPL_TRACE_ERROR("%s failed", __func__);

    LOG_INFO("Unable to set ble data length:%hu", tx_data_length);

  }

}

system/bta/dm/bta_dm_pm.cc

+3 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "bta_sys.h"

#include "btm_api.h"

#include "device/include/controller.h"

#include "osi/include/log.h"

#include "stack/include/acl_api.h"

#include "stack/include/btu.h"
@@ -405,7 +406,7 @@ static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, 
  } else if (j == bta_dm_conn_srvcs.count) {

    /* check if we have more connected service that cbs */

    if (bta_dm_conn_srvcs.count == BTA_DM_NUM_CONN_SRVS) {

      APPL_TRACE_WARNING("bta_dm_act no more connected service cbs");

      LOG_WARN("bta_dm_act no more connected service cbs");

      return;

    }
@@ -415,7 +416,7 @@ static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, 
    bta_dm_conn_srvcs.conn_srvc[j].new_request = true;

    bta_dm_conn_srvcs.conn_srvc[j].peer_bdaddr = peer_addr;



    APPL_TRACE_WARNING("new conn_srvc id:%d, app_id:%d", id, app_id);

    LOG_DEBUG("New connection service id:%d app_id:%d", id, app_id);



    bta_dm_conn_srvcs.count++;

    bta_dm_conn_srvcs.conn_srvc[j].state = status;
@@ -609,7 +610,6 @@ static void bta_dm_pm_set_mode(const RawAddress& peer_addr, 
        }

        break;

      } else if (!bta_dm_cb.pm_timer[i].in_use) {

        APPL_TRACE_DEBUG("%s dm_pm_timer:%d, %d ms", __func__, i, timeout_ms);

        if (available_timer == BTA_DM_PM_MODE_TIMER_MAX) available_timer = i;

      }

    }