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

Commit a450781f authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Fix typo and documentation location for btm files" into main am: 8457b6fa 

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



Change-Id: I450930840ef002a3e8d680aaa14c1c2fe12ebf77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dfbdd718 8457b6fa

system/stack/acl/btm_acl.cc

+10 −10
Original line number Diff line number Diff line
@@ -774,16 +774,6 @@ void BTM_default_unblock_role_switch() { 


extern void bta_gattc_continue_discovery_if_needed(const RawAddress& bd_addr, uint16_t acl_handle);



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

 *

 * Function         btm_read_remote_version_complete

 *

 * Description      This function is called when the command complete message

 *                  is received from the HCI for the remote version info.

 *

 * Returns          void

 *

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

static void maybe_chain_more_commands_after_read_remote_version_complete(uint8_t /* status */,

                                                                         uint16_t handle) {

  tACL_CONN* p_acl_cb = internal_.acl_get_connection_from_handle(handle);
@@ -837,6 +827,16 @@ void btm_process_remote_version_complete(uint8_t status, uint16_t handle, uint8_ 
  }

}



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

 *

 * Function         btm_read_remote_version_complete

 *

 * Description      This function is called when the command complete message

 *                  is received from the HCI for the remote version info.

 *

 * Returns          void

 *

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

void btm_read_remote_version_complete(tHCI_STATUS status, uint16_t handle, uint8_t lmp_version,

                                      uint16_t manufacturer, uint16_t lmp_subversion) {

  btm_process_remote_version_complete(status, handle, lmp_version, manufacturer, lmp_subversion);

system/stack/btm/btm_ble_sec.cc

+10 −10
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ tBTM_STATUS BTM_SetBleDataLength(const RawAddress& bd_addr, uint16_t tx_pdu_leng 
  }



  if (p_dev_rec->get_suggested_tx_octets() >= tx_pdu_length) {

    log::info("Suggested TX octect already set to controller {} >= {}",

    log::info("Suggested TX octet already set to controller {} >= {}",

              p_dev_rec->get_suggested_tx_octets(), tx_pdu_length);

    return tBTM_STATUS::BTM_SUCCESS;

  }
@@ -789,7 +789,7 @@ tBTM_STATUS btm_ble_start_sec_check(const RawAddress& bd_addr, uint16_t psm, boo 
      break;



    case BTM_SEC_ENC_PENDING:

      log::debug("Ecryption pending");

      log::debug("Encryption pending");

      break;

  }
@@ -852,7 +852,7 @@ bool btm_ble_get_enc_key_type(const RawAddress& bd_addr, uint8_t* p_key_types) { 
 *

 * Description      This function is called to read the local DIV

 *

 * Returns          TRUE - if a valid DIV is availavle

 * Returns          TRUE - if a valid DIV is available

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

bool btm_get_local_div(const RawAddress& bd_addr, uint16_t* p_div) {

  tBTM_SEC_DEV_REC* p_dev_rec;
@@ -1078,7 +1078,7 @@ void btm_ble_link_sec_check(const RawAddress& bd_addr, tBTM_LE_AUTH_REQ auth_req 


    log::verbose("dev_rec sec_flags=0x{:x}", p_dev_rec->sec_rec.sec_flags);



    /* currently encrpted  */

    /* currently encrypted  */

    if (p_dev_rec->sec_rec.sec_flags & BTM_SEC_LE_ENCRYPTED) {

      if (p_dev_rec->sec_rec.sec_flags & BTM_SEC_LE_AUTHENTICATED) {

        cur_sec_level = SMP_SEC_AUTHENTICATED;
@@ -1100,7 +1100,7 @@ void btm_ble_link_sec_check(const RawAddress& bd_addr, tBTM_LE_AUTH_REQ auth_req 
       * encryption */

      *p_sec_req_act = BTM_BLE_SEC_REQ_ACT_ENCRYPT;

    } else {

      /* start the pariring process to upgrade the keys*/

      /* start the pairing process to upgrade the keys*/

      *p_sec_req_act = BTM_BLE_SEC_REQ_ACT_PAIR;

    }

  }
@@ -1291,7 +1291,7 @@ static void btm_ble_notify_enc_cmpl(const RawAddress& bd_addr, bool encr_enable) 
 *

 * Function         btm_ble_link_encrypted

 *

 * Description      This function is called when LE link encrption status is

 * Description      This function is called when LE link encryption status is

 *                  changed.

 *

 * Returns          void
@@ -1398,7 +1398,7 @@ void btm_ble_ltk_request_reply(const RawAddress& bda, bool use_stk, const Octet1 
   * race conditions. */



  log::assert_that(p_rec->sec_rec.ble_keys.key_type & BTM_LE_KEY_LENC,

                   "local enccryption key not present");

                   "local encryption key not present");

  p_cb->key_size = p_rec->sec_rec.ble_keys.key_size;

  btsnd_hcic_ble_ltk_req_reply(btm_sec_cb.enc_handle, p_rec->sec_rec.ble_keys.lltk);

}
@@ -1759,7 +1759,7 @@ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, tSMP_E 
 *                  signature: output parameter where data signature is going to

 *                             be stored.

 *

 * Returns          true if signing sucessul, otherwise false.

 * Returns          true if signing successful, otherwise false.

 *

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

bool BTM_BleDataSignature(const RawAddress& bd_addr, uint8_t* p_text, uint16_t len,