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

Commit 5109637a authored by Bhakthavatsala Raghavendra's avatar Bhakthavatsala Raghavendra
Browse files

Donot update security flags while saving CSRK 

Bug: 378957211
Bug: 379109304
Test: mmm packages/module/Bluetooth
Flag: com.android.bluetooth.flags.donot_update_sec_flags_on_csrk_save

Change-Id: Idc6152914c85d369833597a89e5fdff59f1935fc
parent 9d8f2d79

system/stack/btm/btm_ble_sec.cc

+7 −5
Original line number Diff line number Diff line
@@ -937,11 +937,13 @@ void btm_sec_save_le_key(const RawAddress& bd_addr, tBTM_LE_KEY_TYPE key_type, 
        p_rec->sec_rec.ble_keys.counter = p_keys->pcsrk_key.counter;

        p_rec->sec_rec.ble_keys.key_type |= BTM_LE_KEY_PCSRK;

        p_rec->sec_rec.sec_flags |= BTM_SEC_LE_LINK_KEY_KNOWN;

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

          if (p_keys->pcsrk_key.sec_level == SMP_SEC_AUTHENTICATED) {

            p_rec->sec_rec.sec_flags |= BTM_SEC_LE_LINK_KEY_AUTHED;

          } else {

            p_rec->sec_rec.sec_flags &= ~BTM_SEC_LE_LINK_KEY_AUTHED;

          }

        }



        log::verbose(

                "BTM_LE_KEY_PCSRK key_type=0x{:x} sec_flags=0x{:x} "