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

Commit da21d996 authored Jun 25, 2024 by Treehugger Robot Committed by Automerger Merge Worker Jun 25, 2024

Merge changes Ib291c9a6,I98ca045b into main am: 8b308200 am: ab14501f

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

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

parents 7ba2d440 ab14501f

flags/btif_dm.aconfig

+0 −7

Original line number	Diff line number	Diff line
		package: "com.android.bluetooth.flags"
		container: "com.android.btservices"

		flag {
		name: "force_bredr_for_sdp_retry"
		namespace: "bluetooth"
		description: "Force BR/EDR transport for retrying SDP service discovery"
		bug: "326656580"
		}

		flag {
		name: "do_not_replace_existing_cod_with_uncategorized_cod"
		namespace: "bluetooth"

flags/security.aconfig

+0 −7

Original line number	Diff line number	Diff line
		@@ -29,13 +29,6 @@ flag {
		bug: "314331379"
		}

		flag {
		name: "fix_pairing_failure_reason_from_remote"
		namespace: "bluetooth"
		description: "Correct the pairing failure reason reported from remote"
		bug: "320745565"
		}

		flag {
		name: "fix_le_oob_pairing_bypass"
		namespace: "bluetooth"

system/btif/src/btif_dm.cc

+1 −5

Original line number	Diff line number	Diff line
		@@ -1697,11 +1697,7 @@ static void btif_on_service_discovery_results(
		if (pairing_cb.sdp_attempts) {
		log::warn("SDP failed after bonding re-attempting for {}", bd_addr);
		pairing_cb.sdp_attempts++;
		if (com::android::bluetooth::flags::force_bredr_for_sdp_retry()) {
		btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_BR_EDR);
		} else {
		btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_AUTO);
		}
		} else {
		log::warn("SDP triggered by someone failed when bonding");
		}

system/stack/smp/smp_act.cc

+1 −6

Original line number	Diff line number	Diff line
		@@ -535,12 +535,7 @@ void smp_proc_pair_fail(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) {
		p_cb->rcvd_cmd_len);
		p_cb->status = SMP_INVALID_PARAMETERS;
		} else {
		if (com::android::bluetooth::flags::
		fix_pairing_failure_reason_from_remote()) {
		p_cb->status = static_cast<tSMP_STATUS>(p_data->p_data[0]);
		} else {
		p_cb->status = p_data->status;
		}
		}

		/* Cancel pending auth complete timer if set */