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

Commit ef0ce0fc authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge "SMP over BR: Clear LE link key info for temporary bond" into main am: 6cab9ec2 

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



Change-Id: Ib19d938d8dbb700f765ff2f2e122e525b8ff2ddc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents af2b1761 6cab9ec2

system/stack/btm/btm_ble.cc

+14 −2
Original line number Diff line number Diff line
@@ -1863,8 +1863,20 @@ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, 


          if (res == BTM_SUCCESS) {

            p_dev_rec->sec_state = BTM_SEC_STATE_IDLE;

            /* add all bonded device into resolving list if IRK is available*/



            if (p_dev_rec->bond_type != tBTM_SEC_DEV_REC::BOND_TYPE_TEMPORARY) {

              // Add all bonded device into resolving list if IRK is available.

              btm_ble_resolving_list_load_dev(*p_dev_rec);

            } else if (p_dev_rec->ble_hci_handle == HCI_INVALID_HANDLE) {

              // At this point LTK should have been dropped by btif.

              // Reset the flags here if LE is not connected (over BR),

              // otherwise they would be reset on disconnected.

              LOG_DEBUG(

                  "SMP over BR triggered by temporary bond has completed,"

                  " resetting the LK flags");

              p_dev_rec->sec_flags &= ~(BTM_SEC_LE_LINK_KEY_KNOWN);

              p_dev_rec->ble.key_type = BTM_LE_KEY_NONE;

            }

          }



          btm_sec_dev_rec_cback_event(p_dev_rec, res, true);