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

Commit a93c7a18 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Replace the flag le_enc_on_reconnection with the flag... 

Merge "Replace the flag le_enc_on_reconnection with the flag le_enc_on_reconnect" into main am: 72aef4ad am: 0b4968df

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



Change-Id: Ie5c3b15046a206ea5a50f91a888b9b4d488d32ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9515f86f 0b4968df

flags/security.aconfig

+2 −2
Original line number Diff line number Diff line
@@ -36,10 +36,10 @@ flag { 
}



flag {

  name: "le_enc_on_reconnection"

  name: "le_enc_on_reconnect"

  namespace: "bluetooth"

  description: "Encrypt LE link on reconnection with bonded devices"

  bug: "356201480"

  bug: "388864535"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

system/stack/btm/btm_ble_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ void btm_ble_connection_established(const RawAddress& bda) { 
  }



  // Encrypt the link if device is bonded

  if (com::android::bluetooth::flags::le_enc_on_reconnection() &&

  if (com::android::bluetooth::flags::le_enc_on_reconnect() &&

      p_dev_rec->sec_rec.is_le_link_key_known()) {

    btm_ble_set_encryption(bda, BTM_BLE_SEC_ENCRYPT,

                           p_dev_rec->role_central ? HCI_ROLE_CENTRAL : HCI_ROLE_PERIPHERAL);

system/stack/btm/btm_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ tBTM_STATUS BTM_SetEncryption(const RawAddress& bd_addr, tBT_TRANSPORT transport 
                                                          : p_dev_rec->sec_rec.classic_link;



  /* Enqueue security request if security is active */

  if (!com::android::bluetooth::flags::le_enc_on_reconnection()) {

  if (!com::android::bluetooth::flags::le_enc_on_reconnect()) {

    if (p_dev_rec->sec_rec.p_callback ||

        (p_dev_rec->sec_rec.le_link != tSECURITY_STATE::IDLE &&

         p_dev_rec->sec_rec.classic_link != tSECURITY_STATE::IDLE)) {
@@ -4993,7 +4993,7 @@ static void btm_sec_check_pending_enc_req(tBTM_SEC_DEV_REC* p_dev_rec, tBT_TRANS 
    node = list_next(node);

    log::debug("btm_sec_check_pending_enc_req : sec_act=0x{:x}", p_e->sec_act);

    if (p_e->bd_addr == p_dev_rec->bd_addr && p_e->psm == 0 && p_e->transport == transport) {

      if (!com::android::bluetooth::flags::le_enc_on_reconnection()) {

      if (!com::android::bluetooth::flags::le_enc_on_reconnect()) {

        if (encr_enable == 0 || transport == BT_TRANSPORT_BR_EDR ||

            p_e->sec_act == BTM_BLE_SEC_ENCRYPT || p_e->sec_act == BTM_BLE_SEC_ENCRYPT_NO_MITM ||

            (p_e->sec_act == BTM_BLE_SEC_ENCRYPT_MITM &&