Snap for 6886900 from 93ea29bb775ae0f678f38f2a64fd126eb8f521cf to rvc-qpr2-release (a42e53a7) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/smp/smp_act.cc

+11 −1

Original line number	Diff line number	Diff line
		@@ -1254,7 +1254,17 @@ void smp_key_distribution(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
		/* state check to prevent re-entrant */
		if (smp_get_state() == SMP_STATE_BOND_PENDING) {
		if (p_cb->derive_lk) {
		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(p_cb->pairing_bda);
		if (!(p_dev_rec->sec_flags & BTM_SEC_LE_LINK_KEY_AUTHED) &&
		(p_dev_rec->sec_flags & BTM_SEC_LINK_KEY_AUTHED)) {
		SMP_TRACE_DEBUG(
		"%s BR key is higher security than existing LE keys, don't "
		"derive LK from LTK",
		__func__);
		android_errorWriteLog(0x534e4554, "158854097");
		} else {
		smp_derive_link_key_from_long_term_key(p_cb, NULL);
		}
		p_cb->derive_lk = false;
		}