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

Commit 66c26bdb authored Aug 06, 2024 by Chris Manton Committed by Automerger Merge Worker Aug 06, 2024

Merge changes I938709b5,If480d15c,I9143c75d,If796c1b9,Ifb84a6c6 into main am: 0d20fc11

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

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

parents 9b4f1809 0d20fc11

system/bta/ag/bta_ag_sco.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -318,7 +318,7 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) {
		static bool bta_ag_remove_sco(tBTA_AG_SCB* p_scb, bool only_active) {
		if (p_scb->sco_idx != BTM_INVALID_SCO_INDEX) {
		if (!only_active \|\| p_scb->sco_idx == bta_ag_cb.sco.cur_idx) {
		tBTM_STATUS status = BTM_RemoveSco(p_scb->sco_idx);
		tBTM_STATUS status = get_btm_client_interface().sco.BTM_RemoveSco(p_scb->sco_idx);
		log::debug("Removed SCO index:0x{:04x} status:{}", p_scb->sco_idx, btm_status_text(status));
		if (status == BTM_CMD_STARTED) {
		/* SCO is connected; set current control block */

system/bta/dm/bta_dm_act.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -1597,7 +1597,7 @@ void bta_dm_ble_set_data_length(const RawAddress& bd_addr) {
		uint16_t max_len =
		bluetooth::shim::GetController()->GetLeMaximumDataLength().supported_max_tx_octets_;

		if (BTM_SetBleDataLength(bd_addr, max_len) != BTM_SUCCESS) {
		if (get_btm_client_interface().ble.BTM_SetBleDataLength(bd_addr, max_len) != BTM_SUCCESS) {
		log::info("Unable to set ble data length:{}", max_len);
		}
		}

system/bta/hearing_aid/hearing_aid.cc

+3 −1

Original line number	Diff line number	Diff line
		@@ -525,7 +525,9 @@ public:

		// Set data length
		// TODO(jpawlowski: for 16khz only 87 is required, optimize
		BTM_SetBleDataLength(address, 167);
		if (get_btm_client_interface().ble.BTM_SetBleDataLength(address, 167) != BTM_SUCCESS) {
		log::warn("Unable to set BLE data length peer:{} size:{}", address, 167);
		}

		if (BTM_SecIsSecurityPending(address)) {
		/* if security collision happened, wait for encryption done

system/bta/hf_client/bta_hf_client_sco.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ static bool bta_hf_client_sco_remove(tBTA_HF_CLIENT_CB* client_cb) {
		log::verbose("");

		if (client_cb->sco_idx != BTM_INVALID_SCO_INDEX) {
		status = BTM_RemoveSco(client_cb->sco_idx);
		status = get_btm_client_interface().sco.BTM_RemoveSco(client_cb->sco_idx);

		log::verbose("idx 0x{:04x}, status:0x{:x}", client_cb->sco_idx, status);

system/btif/src/btif_sock_sco.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -335,7 +335,7 @@ static void socket_read_ready_cb(socket_t* /* socket /, void context) {
		// routine that the socket is no longer desired and should be torn
		// down.
		if (sco_socket->connect_completed \|\| sco_socket == listen_sco_socket) {
		if (BTM_RemoveSco(sco_socket->sco_handle) == BTM_SUCCESS) {
		if (get_btm_client_interface().sco.BTM_RemoveSco(sco_socket->sco_handle) == BTM_SUCCESS) {
		list_remove(sco_sockets, sco_socket);
		}
		if (sco_socket == listen_sco_socket) {