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

Commit aa506302 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Set LE link as authenticated if encrypted with authenticated LTK" into main am: e4e61fa2 

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



Change-Id: I867b6072894c7c955308aa9daa6ba1373ded7736
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd446ea5 e4e61fa2

system/stack/btm/btm_sec.cc

+4 −1
Original line number Original line Diff line number Diff line
@@ -3397,7 +3397,10 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, 
          p_dev_rec->sec_flags |= BTM_SEC_16_DIGIT_PIN_AUTHED;

          p_dev_rec->sec_flags |= BTM_SEC_16_DIGIT_PIN_AUTHED;

        }

        }

      } else if (p_dev_rec->ble_hci_handle == handle) {  // BLE

      } else if (p_dev_rec->ble_hci_handle == handle) {  // BLE

        p_dev_rec->sec_flags |= BTM_SEC_LE_ENCRYPTED;

        p_dev_rec->set_le_device_encrypted();

        if (p_dev_rec->is_le_link_key_authenticated()) {

            p_dev_rec->set_le_device_authenticated();

        }

      } else {

      } else {

        LOG_ERROR(

        LOG_ERROR(

            "Received encryption change for unknown device handle:0x%04x "

            "Received encryption change for unknown device handle:0x%04x "