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

Commit 6eb676f4 authored by Hui Peng's avatar Hui Peng
Browse files

[Invisalign2] Enacapsulate btm_pair_state_descr 

Bug: 301661850
Test: m com.android.btservices
Flag: EXEMPT, no-op
Change-Id: I292a632325ba9b70dd8d545929b2bff0214d3594
parent 9551322e

system/stack/btm/btm_sec.cc

+41 −38
Original line number Original line Diff line number Diff line
@@ -105,8 +105,6 @@ static void btm_sec_pairing_timeout(void* data); 
static tBTM_STATUS btm_sec_dd_create_conn(tBTM_SEC_DEV_REC* p_dev_rec);

static tBTM_STATUS btm_sec_dd_create_conn(tBTM_SEC_DEV_REC* p_dev_rec);

static void btm_sec_change_pairing_state(tBTM_PAIRING_STATE new_state);

static void btm_sec_change_pairing_state(tBTM_PAIRING_STATE new_state);





static const char* btm_pair_state_descr(tBTM_PAIRING_STATE state);



static void btm_sec_check_pending_reqs(void);

static void btm_sec_check_pending_reqs(void);

static bool btm_sec_queue_mx_request(const RawAddress& bd_addr, uint16_t psm,

static bool btm_sec_queue_mx_request(const RawAddress& bd_addr, uint16_t psm,

                                     bool is_orig, uint16_t security_required,

                                     bool is_orig, uint16_t security_required,
@@ -492,8 +490,8 @@ void BTM_PINCodeReply(const RawAddress& bd_addr, tBTM_STATUS res, 
  LOG_VERBOSE(

  LOG_VERBOSE(

      "BTM_PINCodeReply(): PairState: %s   PairFlags: 0x%02x  PinLen:%d  "

      "BTM_PINCodeReply(): PairState: %s   PairFlags: 0x%02x  PinLen:%d  "

      "Result:%d",

      "Result:%d",

      btm_pair_state_descr(btm_sec_cb.pairing_state), btm_sec_cb.pairing_flags,

      tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

      pin_len, res);

      btm_sec_cb.pairing_flags, pin_len, res);





  /* If timeout already expired or has been canceled, ignore the reply */

  /* If timeout already expired or has been canceled, ignore the reply */

  if (btm_sec_cb.pairing_state != BTM_PAIR_STATE_WAIT_LOCAL_PIN) {

  if (btm_sec_cb.pairing_state != BTM_PAIR_STATE_WAIT_LOCAL_PIN) {
@@ -607,7 +605,7 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
  /* Other security process is in progress */

  /* Other security process is in progress */

  if (btm_sec_cb.pairing_state != BTM_PAIR_STATE_IDLE) {

  if (btm_sec_cb.pairing_state != BTM_PAIR_STATE_IDLE) {

    LOG_ERROR("BTM_SecBond: already busy in state: %s",

    LOG_ERROR("BTM_SecBond: already busy in state: %s",

              btm_pair_state_descr(btm_sec_cb.pairing_state));

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state));

    return (BTM_WRONG_MODE);

    return (BTM_WRONG_MODE);

  }

  }
@@ -723,8 +721,8 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
      status = BTM_CMD_STARTED;

      status = BTM_CMD_STARTED;

    }

    }

    LOG_VERBOSE("State:%s sm4: 0x%x sec_state:%d",

    LOG_VERBOSE("State:%s sm4: 0x%x sec_state:%d",

                btm_pair_state_descr(btm_sec_cb.pairing_state), p_dev_rec->sm4,

                tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

                p_dev_rec->sec_rec.sec_state);

                p_dev_rec->sm4, p_dev_rec->sec_rec.sec_state);

  } else {

  } else {

    /* both local and peer are 2.1  */

    /* both local and peer are 2.1  */

    status = btm_sec_dd_create_conn(p_dev_rec);

    status = btm_sec_dd_create_conn(p_dev_rec);
@@ -793,7 +791,7 @@ tBTM_STATUS BTM_SecBondCancel(const RawAddress& bd_addr) { 
  tBTM_SEC_DEV_REC* p_dev_rec;

  tBTM_SEC_DEV_REC* p_dev_rec;





  LOG_VERBOSE("BTM_SecBondCancel()  State: %s flags:0x%x",

  LOG_VERBOSE("BTM_SecBondCancel()  State: %s flags:0x%x",

              btm_pair_state_descr(btm_sec_cb.pairing_state),

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

              btm_sec_cb.pairing_flags);

              btm_sec_cb.pairing_flags);

  p_dev_rec = btm_find_dev(bd_addr);

  p_dev_rec = btm_find_dev(bd_addr);

  if (!p_dev_rec || btm_sec_cb.pairing_bda != bd_addr) {

  if (!p_dev_rec || btm_sec_cb.pairing_bda != bd_addr) {
@@ -1155,7 +1153,7 @@ static tBTM_STATUS btm_sec_send_hci_disconnect(tBTM_SEC_DEV_REC* p_dev_rec, 
 ******************************************************************************/

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

void BTM_ConfirmReqReply(tBTM_STATUS res, const RawAddress& bd_addr) {

void BTM_ConfirmReqReply(tBTM_STATUS res, const RawAddress& bd_addr) {

  LOG_VERBOSE("BTM_ConfirmReqReply() State: %s  Res: %u",

  LOG_VERBOSE("BTM_ConfirmReqReply() State: %s  Res: %u",

              btm_pair_state_descr(btm_sec_cb.pairing_state), res);

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), res);





  /* If timeout already expired or has been canceled, ignore the reply */

  /* If timeout already expired or has been canceled, ignore the reply */

  if ((btm_sec_cb.pairing_state != BTM_PAIR_STATE_WAIT_NUMERIC_CONFIRM) ||

  if ((btm_sec_cb.pairing_state != BTM_PAIR_STATE_WAIT_NUMERIC_CONFIRM) ||
@@ -1163,7 +1161,7 @@ void BTM_ConfirmReqReply(tBTM_STATUS res, const RawAddress& bd_addr) { 
    LOG_WARN(

    LOG_WARN(

        "Unexpected pairing confirm for %s, pairing_state: %s, pairing_bda: %s",

        "Unexpected pairing confirm for %s, pairing_state: %s, pairing_bda: %s",

        ADDRESS_TO_LOGGABLE_CSTR(bd_addr),

        ADDRESS_TO_LOGGABLE_CSTR(bd_addr),

        btm_pair_state_descr(btm_sec_cb.pairing_state),

        tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

        ADDRESS_TO_LOGGABLE_CSTR(btm_sec_cb.pairing_bda));

        ADDRESS_TO_LOGGABLE_CSTR(btm_sec_cb.pairing_bda));

    return;

    return;

  }

  }
@@ -1202,7 +1200,7 @@ void BTM_ConfirmReqReply(tBTM_STATUS res, const RawAddress& bd_addr) { 
void BTM_PasskeyReqReply(tBTM_STATUS res, const RawAddress& bd_addr,

void BTM_PasskeyReqReply(tBTM_STATUS res, const RawAddress& bd_addr,

                         uint32_t passkey) {

                         uint32_t passkey) {

  LOG_VERBOSE("BTM_PasskeyReqReply: State: %s  res:%d",

  LOG_VERBOSE("BTM_PasskeyReqReply: State: %s  res:%d",

              btm_pair_state_descr(btm_sec_cb.pairing_state), res);

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), res);





  if ((btm_sec_cb.pairing_state == BTM_PAIR_STATE_IDLE) ||

  if ((btm_sec_cb.pairing_state == BTM_PAIR_STATE_IDLE) ||

      (btm_sec_cb.pairing_bda != bd_addr)) {

      (btm_sec_cb.pairing_bda != bd_addr)) {
@@ -1272,7 +1270,7 @@ void BTM_ReadLocalOobData(void) { btsnd_hcic_read_local_oob_data(); } 
void BTM_RemoteOobDataReply(tBTM_STATUS res, const RawAddress& bd_addr,

void BTM_RemoteOobDataReply(tBTM_STATUS res, const RawAddress& bd_addr,

                            const Octet16& c, const Octet16& r) {

                            const Octet16& c, const Octet16& r) {

  LOG_VERBOSE("State: %s res: %d",

  LOG_VERBOSE("State: %s res: %d",

              btm_pair_state_descr(btm_sec_cb.pairing_state), res);

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), res);





  /* If timeout already expired or has been canceled, ignore the reply */

  /* If timeout already expired or has been canceled, ignore the reply */

  if (btm_sec_cb.pairing_state != BTM_PAIR_STATE_WAIT_LOCAL_OOB_RSP) return;

  if (btm_sec_cb.pairing_state != BTM_PAIR_STATE_WAIT_LOCAL_OOB_RSP) return;
@@ -1755,7 +1753,7 @@ tBTM_STATUS btm_sec_mx_access_request(const RawAddress& bd_addr, 
  if ((p_dev_rec->sec_rec.p_callback) ||

  if ((p_dev_rec->sec_rec.p_callback) ||

      (btm_sec_cb.pairing_state != BTM_PAIR_STATE_IDLE)) {

      (btm_sec_cb.pairing_state != BTM_PAIR_STATE_IDLE)) {

    LOG_DEBUG("Pairing in progress pairing_state:%s",

    LOG_DEBUG("Pairing in progress pairing_state:%s",

              btm_pair_state_descr(btm_sec_cb.pairing_state));

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state));





    rc = BTM_CMD_STARTED;

    rc = BTM_CMD_STARTED;
@@ -1974,7 +1972,8 @@ static void btm_sec_bond_cancel_complete(void) { 
 ******************************************************************************/

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

void btm_create_conn_cancel_complete(uint8_t status, const RawAddress bd_addr) {

void btm_create_conn_cancel_complete(uint8_t status, const RawAddress bd_addr) {

  LOG_VERBOSE("btm_create_conn_cancel_complete(): in State: %s  status:%d",

  LOG_VERBOSE("btm_create_conn_cancel_complete(): in State: %s  status:%d",

              btm_pair_state_descr(btm_sec_cb.pairing_state), status);

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

              status);

  log_link_layer_connection_event(

  log_link_layer_connection_event(

      &bd_addr, bluetooth::common::kUnknownConnectionHandle,

      &bd_addr, bluetooth::common::kUnknownConnectionHandle,

      android::bluetooth::DIRECTION_OUTGOING, android::bluetooth::LINK_TYPE_ACL,

      android::bluetooth::DIRECTION_OUTGOING, android::bluetooth::LINK_TYPE_ACL,
@@ -2208,7 +2207,7 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, 
    LOG_DEBUG(

    LOG_DEBUG(

        "Remote read request complete for unknown device pairing_state:%s "

        "Remote read request complete for unknown device pairing_state:%s "

        "status:%s name:%s",

        "status:%s name:%s",

        btm_pair_state_descr(btm_sec_cb.pairing_state),

        tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

        hci_status_code_text(status).c_str(), p_bd_name);

        hci_status_code_text(status).c_str(), p_bd_name);





    call_registered_rmt_name_callbacks(p_bd_addr, nullptr, nullptr, status);

    call_registered_rmt_name_callbacks(p_bd_addr, nullptr, nullptr, status);
@@ -2220,7 +2219,7 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, 
    LOG_DEBUG(

    LOG_DEBUG(

        "Remote read request complete for known device pairing_state:%s "

        "Remote read request complete for known device pairing_state:%s "

        "name:%s sec_state:%s",

        "name:%s sec_state:%s",

        btm_pair_state_descr(btm_sec_cb.pairing_state), p_bd_name,

        tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), p_bd_name,

        security_state_text(p_dev_rec->sec_rec.sec_state).c_str());

        security_state_text(p_dev_rec->sec_rec.sec_state).c_str());





    strlcpy((char*)p_dev_rec->sec_bd_name, (const char*)p_bd_name,

    strlcpy((char*)p_dev_rec->sec_bd_name, (const char*)p_bd_name,
@@ -2232,7 +2231,7 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, 
    LOG_WARN(

    LOG_WARN(

        "Remote read request failed for known device pairing_state:%s "

        "Remote read request failed for known device pairing_state:%s "

        "status:%s name:%s sec_state:%s",

        "status:%s name:%s sec_state:%s",

        btm_pair_state_descr(btm_sec_cb.pairing_state),

        tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

        hci_status_code_text(status).c_str(), p_bd_name,

        hci_status_code_text(status).c_str(), p_bd_name,

        security_state_text(p_dev_rec->sec_rec.sec_state).c_str());

        security_state_text(p_dev_rec->sec_rec.sec_state).c_str());
@@ -2469,7 +2468,7 @@ void btm_io_capabilities_req(RawAddress p) { 
  p_dev_rec->sm4 |= BTM_SM4_TRUE;

  p_dev_rec->sm4 |= BTM_SM4_TRUE;





  LOG_VERBOSE("State: %s, Security Mode: %d, Device security Flags: 0x%04x",

  LOG_VERBOSE("State: %s, Security Mode: %d, Device security Flags: 0x%04x",

              btm_pair_state_descr(btm_sec_cb.pairing_state),

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

              btm_sec_cb.security_mode, btm_sec_cb.pairing_flags);

              btm_sec_cb.security_mode, btm_sec_cb.pairing_flags);





  uint8_t err_code = 0;

  uint8_t err_code = 0;
@@ -2596,8 +2595,8 @@ void btm_io_capabilities_req(RawAddress p) { 
  btm_sec_cb.devcb.loc_io_caps = evt_data.io_cap;

  btm_sec_cb.devcb.loc_io_caps = evt_data.io_cap;





  LOG_VERBOSE("State: %s  IO_CAP:%d oob_data:%d auth_req:%d",

  LOG_VERBOSE("State: %s  IO_CAP:%d oob_data:%d auth_req:%d",

              btm_pair_state_descr(btm_sec_cb.pairing_state), evt_data.io_cap,

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

              evt_data.oob_data, evt_data.auth_req);

              evt_data.io_cap, evt_data.oob_data, evt_data.auth_req);





  btsnd_hcic_io_cap_req_reply(evt_data.bd_addr, evt_data.io_cap,

  btsnd_hcic_io_cap_req_reply(evt_data.bd_addr, evt_data.io_cap,

                              evt_data.oob_data, evt_data.auth_req);

                              evt_data.oob_data, evt_data.auth_req);
@@ -2678,7 +2677,7 @@ void btm_proc_sp_req_evt(tBTM_SP_EVT event, const RawAddress bda, 
  p_bda = bda;

  p_bda = bda;

  LOG_VERBOSE("BDA: %s, event: 0x%x, state: %s",

  LOG_VERBOSE("BDA: %s, event: 0x%x, state: %s",

              ADDRESS_TO_LOGGABLE_CSTR(p_bda), event,

              ADDRESS_TO_LOGGABLE_CSTR(p_bda), event,

              btm_pair_state_descr(btm_sec_cb.pairing_state));

              tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state));





  p_dev_rec = btm_find_dev(p_bda);

  p_dev_rec = btm_find_dev(p_bda);

  if ((p_dev_rec != NULL) &&

  if ((p_dev_rec != NULL) &&
@@ -2824,7 +2823,7 @@ void btm_simple_pair_complete(const RawAddress bd_addr, uint8_t status) { 




  LOG_VERBOSE(

  LOG_VERBOSE(

      "btm_simple_pair_complete()  Pair State: %s  Status:%d  sec_state: %u",

      "btm_simple_pair_complete()  Pair State: %s  Status:%d  sec_state: %u",

      btm_pair_state_descr(btm_sec_cb.pairing_state), status,

      tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), status,

      p_dev_rec->sec_rec.sec_state);

      p_dev_rec->sec_rec.sec_state);





  if (status == HCI_SUCCESS) {

  if (status == HCI_SUCCESS) {
@@ -3017,12 +3016,13 @@ void btm_sec_auth_complete(uint16_t handle, tHCI_STATUS status) { 
    LOG_VERBOSE(

    LOG_VERBOSE(

        "Security Manager: in state: %s, handle: %d, status: %d, "

        "Security Manager: in state: %s, handle: %d, status: %d, "

        "dev->sec_rec.sec_state:%d, bda: %s, RName: %s",

        "dev->sec_rec.sec_state:%d, bda: %s, RName: %s",

        btm_pair_state_descr(btm_sec_cb.pairing_state), handle, status,

        tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), handle,

        p_dev_rec->sec_rec.sec_state,

        status, p_dev_rec->sec_rec.sec_state,

        ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr), p_dev_rec->sec_bd_name);

        ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr), p_dev_rec->sec_bd_name);

  } else {

  } else {

    LOG_VERBOSE("Security Manager: in state: %s, handle: %d, status: %d",

    LOG_VERBOSE("Security Manager: in state: %s, handle: %d, status: %d",

                btm_pair_state_descr(btm_sec_cb.pairing_state), handle, status);

                tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

                handle, status);

  }

  }





  /* For transaction collision we need to wait and repeat.  There is no need */

  /* For transaction collision we need to wait and repeat.  There is no need */
@@ -3389,7 +3389,7 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, 
    LOG_DEBUG(

    LOG_DEBUG(

        "Connected to new device state:%s handle:0x%04x status:%s "

        "Connected to new device state:%s handle:0x%04x status:%s "

        "enc_mode:%hhu bda:%s",

        "enc_mode:%hhu bda:%s",

        btm_pair_state_descr(btm_sec_cb.pairing_state), handle,

        tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), handle,

        hci_status_code_text(status).c_str(), enc_mode,

        hci_status_code_text(status).c_str(), enc_mode,

        ADDRESS_TO_LOGGABLE_CSTR(bda));

        ADDRESS_TO_LOGGABLE_CSTR(bda));
@@ -3415,7 +3415,7 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, 
    LOG_DEBUG(

    LOG_DEBUG(

        "Connected to known device state:%s handle:0x%04x status:%s "

        "Connected to known device state:%s handle:0x%04x status:%s "

        "enc_mode:%hhu bda:%s RName:%s",

        "enc_mode:%hhu bda:%s RName:%s",

        btm_pair_state_descr(btm_sec_cb.pairing_state), handle,

        tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state), handle,

        hci_status_code_text(status).c_str(), enc_mode,

        hci_status_code_text(status).c_str(), enc_mode,

        ADDRESS_TO_LOGGABLE_CSTR(bda), p_dev_rec->sec_bd_name);

        ADDRESS_TO_LOGGABLE_CSTR(bda), p_dev_rec->sec_bd_name);
@@ -3741,7 +3741,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_REASON reason, 
  LOG_DEBUG(

  LOG_DEBUG(

      "Disconnection complete device:%s name:%s state:%s reason:%s sec_req:%x",

      "Disconnection complete device:%s name:%s state:%s reason:%s sec_req:%x",

      ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr), p_dev_rec->sec_bd_name,

      ADDRESS_TO_LOGGABLE_CSTR(p_dev_rec->bd_addr), p_dev_rec->sec_bd_name,

      btm_pair_state_descr(btm_sec_cb.pairing_state),

      tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

      hci_reason_code_text(reason).c_str(),

      hci_reason_code_text(reason).c_str(),

      p_dev_rec->sec_rec.security_required);

      p_dev_rec->sec_rec.security_required);
@@ -4042,7 +4042,8 @@ static void btm_sec_pairing_timeout(void* /* data */) { 
  p_dev_rec = btm_find_dev(p_cb->pairing_bda);

  p_dev_rec = btm_find_dev(p_cb->pairing_bda);





  LOG_VERBOSE("State: %s   Flags: %u",

  LOG_VERBOSE("State: %s   Flags: %u",

              btm_pair_state_descr(p_cb->pairing_state), p_cb->pairing_flags);

              tBTM_SEC_CB::btm_pair_state_descr(p_cb->pairing_state),

              p_cb->pairing_flags);





  switch (p_cb->pairing_state) {

  switch (p_cb->pairing_state) {

    case BTM_PAIR_STATE_WAIT_PIN_REQ:

    case BTM_PAIR_STATE_WAIT_PIN_REQ:
@@ -4123,7 +4124,7 @@ static void btm_sec_pairing_timeout(void* /* data */) { 




    default:

    default:

      LOG_WARN("not processed state: %s",

      LOG_WARN("not processed state: %s",

               btm_pair_state_descr(btm_sec_cb.pairing_state));

               tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state));

      btm_sec_change_pairing_state(BTM_PAIR_STATE_IDLE);

      btm_sec_change_pairing_state(BTM_PAIR_STATE_IDLE);

      break;

      break;

  }

  }
@@ -4148,7 +4149,7 @@ void btm_sec_pin_code_request(const RawAddress p_bda) { 




  LOG_DEBUG("Controller requests PIN code device:%s state:%s",

  LOG_DEBUG("Controller requests PIN code device:%s state:%s",

            ADDRESS_TO_LOGGABLE_CSTR(p_bda),

            ADDRESS_TO_LOGGABLE_CSTR(p_bda),

            btm_pair_state_descr(btm_sec_cb.pairing_state));

            tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state));





  RawAddress local_bd_addr = *controller_get_interface()->get_address();

  RawAddress local_bd_addr = *controller_get_interface()->get_address();

  if (p_bda == local_bd_addr) {

  if (p_bda == local_bd_addr) {
@@ -4164,7 +4165,7 @@ void btm_sec_pin_code_request(const RawAddress p_bda) { 
    } else if ((btm_sec_cb.pairing_state != BTM_PAIR_STATE_WAIT_PIN_REQ) ||

    } else if ((btm_sec_cb.pairing_state != BTM_PAIR_STATE_WAIT_PIN_REQ) ||

               p_bda != btm_sec_cb.pairing_bda) {

               p_bda != btm_sec_cb.pairing_bda) {

      LOG_WARN("btm_sec_pin_code_request() rejected - state: %s",

      LOG_WARN("btm_sec_pin_code_request() rejected - state: %s",

               btm_pair_state_descr(btm_sec_cb.pairing_state));

               tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state));

      btsnd_hcic_pin_code_neg_reply(p_bda);

      btsnd_hcic_pin_code_neg_reply(p_bda);

      return;

      return;

    }

    }
@@ -4602,15 +4603,17 @@ static void btm_sec_change_pairing_state(tBTM_PAIRING_STATE new_state) { 
  tBTM_PAIRING_STATE old_state = btm_sec_cb.pairing_state;

  tBTM_PAIRING_STATE old_state = btm_sec_cb.pairing_state;





  LOG_DEBUG("Pairing state changed %s => %s pairing_flags:0x%x",

  LOG_DEBUG("Pairing state changed %s => %s pairing_flags:0x%x",

            btm_pair_state_descr(btm_sec_cb.pairing_state),

            tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

            btm_pair_state_descr(new_state), btm_sec_cb.pairing_flags);

            tBTM_SEC_CB::btm_pair_state_descr(new_state),

            btm_sec_cb.pairing_flags);





  if (btm_sec_cb.pairing_state != new_state) {

  if (btm_sec_cb.pairing_state != new_state) {

    BTM_LogHistory(

    BTM_LogHistory(

        kBtmLogTag, btm_sec_cb.pairing_bda, "Pairing state changed",

        kBtmLogTag, btm_sec_cb.pairing_bda, "Pairing state changed",

        base::StringPrintf("%s => %s",

        base::StringPrintf(

                           btm_pair_state_descr(btm_sec_cb.pairing_state),

            "%s => %s",

                           btm_pair_state_descr(new_state)));

            tBTM_SEC_CB::btm_pair_state_descr(btm_sec_cb.pairing_state),

            tBTM_SEC_CB::btm_pair_state_descr(new_state)));

  }

  }

  btm_sec_cb.pairing_state = new_state;

  btm_sec_cb.pairing_state = new_state;
@@ -4645,7 +4648,7 @@ static void btm_sec_change_pairing_state(tBTM_PAIRING_STATE new_state) { 
 * Description      Return state description for tracing

 * Description      Return state description for tracing

 *

 *

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

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

static const char* btm_pair_state_descr(tBTM_PAIRING_STATE state) {

const char* tBTM_SEC_CB::btm_pair_state_descr(tBTM_PAIRING_STATE state) {

  switch (state) {

  switch (state) {

    case BTM_PAIR_STATE_IDLE:

    case BTM_PAIR_STATE_IDLE:

      return ("IDLE");

      return ("IDLE");

system/stack/btm/btm_sec_cb.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -99,6 +99,9 @@ class tBTM_SEC_CB { 
                  uint32_t mx_chan_id);

                  uint32_t mx_chan_id);

  uint8_t RemoveServiceById(uint8_t service_id);

  uint8_t RemoveServiceById(uint8_t service_id);

  uint8_t RemoveServiceByPsm(uint16_t psm);

  uint8_t RemoveServiceByPsm(uint16_t psm);



  // misc static methods

  static const char* btm_pair_state_descr(tBTM_PAIRING_STATE state);

};

};





extern tBTM_SEC_CB btm_sec_cb;

extern tBTM_SEC_CB btm_sec_cb;