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

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

Merge "btm_log_history: encryption status" am: ddeaef05 am: f7e43a4c am: 4cff2401 

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



Change-Id: I68f1d8bbd023c0a478ee66aae1f474507e0437d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8817c379 4cff2401

system/stack/btm/btm_sec.cc

+15 −0
Original line number Diff line number Diff line
@@ -3295,6 +3295,8 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, 
  /* for random timeout because only peripheral should receive the result */

  if ((status == HCI_ERR_LMP_ERR_TRANS_COLLISION) ||

      (status == HCI_ERR_DIFF_TRANSACTION_COLLISION)) {

    LOG_ERROR("Encryption collision failed status:%s",

              hci_error_code_text(status).c_str());

    btm_sec_auth_collision(handle);

    return;

  }
@@ -3346,6 +3348,7 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, 
            handle, hci_status_code_text(status).c_str(), encr_enable);

      }

    } else {

      LOG_INFO("Encryption was not enabled locally resetting encryption state");

      /* It is possible that we decrypted the link to perform role switch */

      /* mark link not to be encrypted, so that when we execute security next

       * time it will kick in again */
@@ -3362,6 +3365,18 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, 
    }

  }



  const bool is_encrypted =

      p_dev_rec->is_le_device_encrypted() || p_dev_rec->is_device_encrypted();

  BTM_LogHistory(

      kBtmLogTag,

      (transport == BT_TRANSPORT_LE) ? p_dev_rec->ble.pseudo_addr

                                     : p_dev_rec->bd_addr,

      (status == HCI_SUCCESS) ? "Encryption success" : "Encryption failed",

      base::StringPrintf("status:%s transport:%s is_encrypted:%c",

                         hci_status_code_text(status).c_str(),

                         bt_transport_text(transport).c_str(),

                         is_encrypted ? 'T' : 'F'));



  LOG_DEBUG("after update p_dev_rec->sec_flags=0x%x", p_dev_rec->sec_flags);



  btm_sec_check_pending_enc_req(p_dev_rec, transport, encr_enable);