Snap for 7080991 from 392399f3a3d97092fbaf0c79664a4e08edb0c9f3 to sc-release (39893b2d) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.cc

+10 −10

Original line number	Diff line number	Diff line
		@@ -2183,7 +2183,7 @@ static void bta_dm_local_name_cback(UNUSED_ATTR void* p_name) {
		}

		static void handle_role_change(const RawAddress& bd_addr, uint8_t new_role,
		uint8_t hci_status) {
		tHCI_STATUS hci_status) {
		tBTA_DM_PEER_DEVICE* p_dev = bta_dm_find_peer_device(bd_addr);
		if (!p_dev) {
		LOG_WARN(
		@@ -2230,7 +2230,7 @@ static void handle_role_change(const RawAddress& bd_addr, uint8_t new_role,
		}

		void BTA_dm_report_role_change(const RawAddress bd_addr, uint8_t new_role,
		uint8_t hci_status) {
		tHCI_STATUS hci_status) {
		do_in_main_thread(
		FROM_HERE, base::Bind(handle_role_change, bd_addr, new_role, hci_status));
		}
		@@ -3569,10 +3569,12 @@ void bta_dm_ble_observe(bool start, uint8_t duration,
		}

		/** This function set the maximum transmission packet size */
		void bta_dm_ble_set_data_length(const RawAddress& bd_addr,
		uint16_t tx_data_length) {
		if (BTM_SetBleDataLength(bd_addr, tx_data_length) != BTM_SUCCESS) {
		LOG_INFO("Unable to set ble data length:%hu", tx_data_length);
		void bta_dm_ble_set_data_length(const RawAddress& bd_addr) {
		const controller_t* controller = controller_get_interface();
		uint16_t max_len = controller->get_ble_maximum_tx_data_length();

		if (BTM_SetBleDataLength(bd_addr, max_len) != BTM_SUCCESS) {
		LOG_INFO("Unable to set ble data length:%hu", max_len);
		}
		}

		@@ -3716,11 +3718,9 @@ void btm_dm_start_gatt_discovery(const RawAddress& bd_addr) {
		BTA_GATTC_ServiceSearchRequest(bta_dm_search_cb.conn_id, nullptr);
		} else {
		if (BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_LE)) {
		BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, true, BT_TRANSPORT_LE,
		true);
		BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, true, true);
		} else {
		BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, true, BT_TRANSPORT_LE,
		false);
		BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, true, false);
		}
		}
		}

system/bta/dm/bta_dm_api.cc

+3 −4

Original line number	Diff line number	Diff line
		@@ -536,10 +536,9 @@ void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK* p_cmpl_cback) {
		}

		/** This function is to set maximum LE data packet size */
		void BTA_DmBleSetDataLength(const RawAddress& remote_device,
		uint16_t tx_data_length) {
		do_in_main_thread(FROM_HERE, base::Bind(bta_dm_ble_set_data_length,
		remote_device, tx_data_length));
		void BTA_DmBleRequestMaxTxDataLength(const RawAddress& remote_device) {
		do_in_main_thread(FROM_HERE,
		base::Bind(bta_dm_ble_set_data_length, remote_device));
		}

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

system/bta/dm/bta_dm_int.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -506,7 +506,7 @@ extern void bta_dm_ble_update_conn_params(const RawAddress&, uint16_t, uint16_t,
		uint16_t);
		extern void bta_dm_ble_config_local_privacy(bool);

		extern void bta_dm_ble_set_data_length(const RawAddress&, uint16_t);
		extern void bta_dm_ble_set_data_length(const RawAddress& bd_addr);

		extern void bta_dm_ble_get_energy_info(tBTA_BLE_ENERGY_INFO_CBACK*);

system/bta/gatt/bta_gattc_act.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {

		cb_data.close.client_if = p_clcb->p_rcb->client_if;
		cb_data.close.conn_id = p_clcb->bta_conn_id;
		cb_data.close.reason = p_clcb->reason;
		cb_data.close.reason = 0;
		cb_data.close.remote_bda = p_clcb->bda;
		cb_data.close.status = GATT_SUCCESS;

		@@ -1068,12 +1068,12 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr,
		if (connected) {
		LOG_INFO("Connected att_id:%hhu transport:%s reason:%s", gattc_if,
		BtTransportText(transport).c_str(),
		hci_error_code_text(reason).c_str());
		gatt_disconnection_reason_text(reason).c_str());
		btif_debug_conn_state(bdaddr, BTIF_DEBUG_CONNECTED, GATT_CONN_UNKNOWN);
		} else {
		LOG_INFO("Disconnected att_id:%hhu transport:%s reason:%s", gattc_if,
		BtTransportText(transport).c_str(),
		hci_error_code_text(reason).c_str());
		gatt_disconnection_reason_text(reason).c_str());
		btif_debug_conn_state(bdaddr, BTIF_DEBUG_DISCONNECTED, GATT_CONN_UNKNOWN);
		}

system/bta/gatt/bta_gattc_api.cc

+3 −4

Original line number	Diff line number	Diff line
		@@ -119,11 +119,10 @@ void BTA_GATTC_AppDeregister(tGATT_IF client_if) {
		*
		******************************************************************************/
		void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda,
		bool is_direct, tBT_TRANSPORT transport,
		bool opportunistic) {
		bool is_direct, bool opportunistic) {
		uint8_t phy = controller_get_interface()->get_le_all_initiating_phys();
		BTA_GATTC_Open(client_if, remote_bda, is_direct, transport, opportunistic,
		phy);
		BTA_GATTC_Open(client_if, remote_bda, is_direct, BT_TRANSPORT_LE,
		opportunistic, phy);
		}

		void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda,