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

Commit adcd5ef4 authored Aug 07, 2024 by Bhakthavatsala Raghavendra Committed by Automerger Merge Worker Aug 07, 2024

Merge "Add clear_auth_collision_state_on_pairing_complete flag" into main am:...

Merge "Add clear_auth_collision_state_on_pairing_complete flag" into main am: a36ba831 am: 67d60cb9

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

Change-Id: Ie41edfeee14990c3b4cda84319c015faee1f7ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents dbd53cd1 67d60cb9

flags/pairing.aconfig

+5 −2

Original line number	Diff line number	Diff line
		@@ -2,10 +2,13 @@ package: "com.android.bluetooth.flags"
		container: "com.android.btservices"

		flag {
		name: "clear_collision_state_on_pairing_complete"
		name: "clear_auth_collision_state_on_pairing_complete"
		namespace: "bluetooth"
		description: "Clear authentication collision state on pairing conclusion"
		bug: "327208896"
		bug: "358116527"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {

system/stack/btm/btm_sec.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -3015,7 +3015,7 @@ void btm_sec_auth_complete(uint16_t handle, tHCI_STATUS status) {
		return;
		}

		if (com::android::bluetooth::flags::clear_collision_state_on_pairing_complete()) {
		if (com::android::bluetooth::flags::clear_auth_collision_state_on_pairing_complete()) {
		if (p_dev_rec && btm_sec_cb.p_collided_dev_rec &&
		p_dev_rec->bd_addr == btm_sec_cb.p_collided_dev_rec->bd_addr) {
		btm_sec_cb.collision_start_time = 0;
		@@ -3765,7 +3765,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_REASON reason, std::string comme
		/* clear unused flags */
		p_dev_rec->sm4 &= BTM_SM4_TRUE;

		if (com::android::bluetooth::flags::clear_collision_state_on_pairing_complete()) {
		if (com::android::bluetooth::flags::clear_auth_collision_state_on_pairing_complete()) {
		if (btm_sec_cb.p_collided_dev_rec &&
		p_dev_rec->bd_addr == btm_sec_cb.p_collided_dev_rec->bd_addr) {
		log::debug("clear auth collision info after disconnection");