SetPreferredPhy/ReadPhy callback fix (9fd375ec) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_ble.cc

+7 −3

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@
		extern bool aes_cipher_msg_auth_code(BT_OCTET16 key, uint8_t* input,
		uint16_t length, uint16_t tlen,
		uint8_t* p_signature);
		extern void gatt_notify_phy_updated(uint8_t status, uint16_t handle,
		uint8_t tx_phy, uint8_t rx_phy);

		/******************************************************************************/
		/* External Function to be called by other modules */
		@@ -871,7 +873,7 @@ void BTM_BleReadPhy(
		!controller_get_interface()->supports_ble_coded_phy()) {
		BTM_TRACE_ERROR("%s failed, request not supported in local controller!",
		__func__);
		cb.Run(0, 0, HCI_ERR_ILLEGAL_COMMAND);
		cb.Run(0, 0, GATT_REQ_NOT_SUPPORTED);
		return;
		}

		@@ -958,22 +960,24 @@ void BTM_BleSetPhy(const RawAddress& bd_addr, uint8_t tx_phys, uint8_t rx_phys,
		"= 0x%04x",
		__func__, all_phys, tx_phys, rx_phys, phy_options);

		uint16_t handle = p_acl->hci_handle;

		// checking if local controller supports it!
		if (!controller_get_interface()->supports_ble_2m_phy() &&
		!controller_get_interface()->supports_ble_coded_phy()) {
		BTM_TRACE_ERROR("%s failed, request not supported in local controller!",
		__func__);
		gatt_notify_phy_updated(GATT_REQ_NOT_SUPPORTED, handle, tx_phys, rx_phys);
		return;
		}

		if (!HCI_LE_2M_PHY_SUPPORTED(p_acl->peer_le_features) &&
		!HCI_LE_CODED_PHY_SUPPORTED(p_acl->peer_le_features)) {
		BTM_TRACE_ERROR("%s failed, peer does not support request", __func__);
		gatt_notify_phy_updated(GATT_REQ_NOT_SUPPORTED, handle, tx_phys, rx_phys);
		return;
		}

		uint16_t handle = p_acl->hci_handle;

		const uint8_t len = HCIC_PARAM_SIZE_BLE_SET_PHY;
		uint8_t data[len];
		uint8_t* pp = data;

system/stack/btm/btm_ble_gap.cc

+1 −11

Original line number	Diff line number	Diff line
		@@ -2140,17 +2140,7 @@ void btm_ble_process_phy_update_pkt(uint8_t len, uint8_t* data) {
		STREAM_TO_UINT8(tx_phy, p);
		STREAM_TO_UINT8(rx_phy, p);

		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(handle);
		if (!p_dev_rec) {
		BTM_TRACE_WARNING("%s: No Device Found!", __func__);
		return;
		}

		tGATT_TCB* p_tcb =
		gatt_find_tcb_by_addr(p_dev_rec->ble.pseudo_addr, BT_TRANSPORT_LE);
		if (p_tcb == NULL) return;

		gatt_notify_phy_updated(p_tcb, tx_phy, rx_phy, status);
		gatt_notify_phy_updated(status, handle, tx_phy, rx_phy);
		}

		/*******************************************************************************

system/stack/gatt/gatt_int.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -500,9 +500,8 @@ extern void gatt_sr_send_req_callback(uint16_t conn_id, uint32_t trans_id,
		extern uint32_t gatt_sr_enqueue_cmd(tGATT_TCB& tcb, uint8_t op_code,
		uint16_t handle);
		extern bool gatt_cancel_open(tGATT_IF gatt_if, const RawAddress& bda);
		extern void gatt_notify_phy_updated(tGATT_TCB* p_tcb, uint8_t tx_phy,
		uint8_t rx_phy, uint8_t status);

		extern void gatt_notify_phy_updated(uint8_t status, uint16_t handle,
		uint8_t tx_phy, uint8_t rx_phy);
		/* */

		extern tGATT_REG* gatt_get_regcb(tGATT_IF gatt_if);

system/stack/gatt/gatt_main.cc

+13 −3

Original line number	Diff line number	Diff line
		@@ -490,8 +490,18 @@ static void gatt_channel_congestion(tGATT_TCB* p_tcb, bool congested) {
		}
		}

		void gatt_notify_phy_updated(tGATT_TCB* p_tcb, uint8_t tx_phy, uint8_t rx_phy,
		uint8_t status) {
		void gatt_notify_phy_updated(uint8_t status, uint16_t handle, uint8_t tx_phy,
		uint8_t rx_phy) {
		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(handle);
		if (!p_dev_rec) {
		BTM_TRACE_WARNING("%s: No Device Found!", __func__);
		return;
		}

		tGATT_TCB* p_tcb =
		gatt_find_tcb_by_addr(p_dev_rec->ble.pseudo_addr, BT_TRANSPORT_LE);
		if (p_tcb == NULL) return;

		for (int i = 0; i < GATT_MAX_APPS; i++) {
		tGATT_REG* p_reg = &gatt_cb.cl_rcb[i];
		if (p_reg->in_use && p_reg->app_cb.p_phy_update_cb) {