Merge "Rename pending_connections to new_connection_requests" into main (b81ae821) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/include/btif_hh.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ typedef struct {
		btif_hh_added_device_t added_devices[BTIF_HH_MAX_ADDED_DEV];
		bool service_dereg_active;

		std::list<tAclLinkSpec> pending_connections;
		std::list<tAclLinkSpec> new_connection_requests;
		} btif_hh_cb_t;

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

system/btif/src/btif_hh.cc

+17 −16

Original line number	Diff line number	Diff line
		@@ -571,8 +571,9 @@ static void hh_open_handler(tBTA_HH_CONN& conn) {
		dev_status = p_dev->dev_status;
		}

		if (std::find(btif_hh_cb.pending_connections.begin(), btif_hh_cb.pending_connections.end(),
		conn.link_spec) != btif_hh_cb.pending_connections.end()) {
		if (std::find(btif_hh_cb.new_connection_requests.begin(),
		btif_hh_cb.new_connection_requests.end(),
		conn.link_spec) != btif_hh_cb.new_connection_requests.end()) {
		log::verbose("Device connection was pending for: {}, status: {}", conn.link_spec,
		btif_hh_status_text(btif_hh_cb.status));
		dev_status = BTHH_CONN_STATE_CONNECTING;
		@@ -602,7 +603,7 @@ static void hh_open_handler(tBTA_HH_CONN& conn) {
		BTHH_STATE_UPDATE(conn.link_spec, BTHH_CONN_STATE_CONNECTING);
		}

		btif_hh_cb.pending_connections.remove(conn.link_spec);
		btif_hh_cb.new_connection_requests.remove(conn.link_spec);

		if (conn.status != BTA_HH_OK) {
		btif_dm_hh_open_failed(&conn.link_spec.addrt.bda);
		@@ -1036,7 +1037,7 @@ bt_status_t btif_hh_virtual_unplug(const tAclLinkSpec& link_spec) {
		if (btif_hh_find_dev_by_link_spec(link_spec) != nullptr \|\|
		btif_hh_find_added_dev(link_spec) != nullptr) {
		// Remove pending connection if address matches
		btif_hh_cb.pending_connections.remove_if(
		btif_hh_cb.new_connection_requests.remove_if(
		[link_spec](auto ls) { return ls.addrt.bda == link_spec.addrt.bda; });

		btif_hh_remove_device(link_spec);
		@@ -1047,7 +1048,7 @@ bt_status_t btif_hh_virtual_unplug(const tAclLinkSpec& link_spec) {

		// Abort outgoing initial connection attempt
		bool pending_connection = false;
		for (auto ls : btif_hh_cb.pending_connections) {
		for (auto ls : btif_hh_cb.new_connection_requests) {
		if (ls.addrt.bda == link_spec.addrt.bda) {
		pending_connection = true;
		break;
		@@ -1055,7 +1056,7 @@ bt_status_t btif_hh_virtual_unplug(const tAclLinkSpec& link_spec) {
		}

		if (pending_connection) {
		btif_hh_cb.pending_connections.remove_if(
		btif_hh_cb.new_connection_requests.remove_if(
		[link_spec](auto ls) { return ls.addrt.bda == link_spec.addrt.bda; });

		/* need to notify up-layer device is disconnected to avoid
		@@ -1123,7 +1124,7 @@ bt_status_t btif_hh_connect(const tAclLinkSpec& link_spec) {
		// Add the new connection to the pending list
		if (!com::android::bluetooth::flags::pending_hid_connection_cancellation() \|\|
		added_dev == nullptr) {
		btif_hh_cb.pending_connections.push_back(link_spec);
		btif_hh_cb.new_connection_requests.push_back(link_spec);
		}

		/* Not checking the NORMALLY_Connectible flags from sdp record, and anyways
		@@ -1585,7 +1586,7 @@ static bt_status_t connect(RawAddress* bd_addr, tBLE_ADDR_TYPE addr_type, tBT_TR
		BTHH_LOG_LINK(link_spec);

		if (!com::android::bluetooth::flags::initiate_multiple_hid_connections() &&
		!btif_hh_cb.pending_connections.empty()) {
		!btif_hh_cb.new_connection_requests.empty()) {
		log::warn("HH status = {}", btif_hh_status_text(btif_hh_cb.status));
		return BT_STATUS_BUSY;
		} else if (btif_hh_cb.status == BTIF_HH_DISABLED \|\| btif_hh_cb.status == BTIF_HH_DISABLING) {
		@@ -1652,14 +1653,14 @@ static bt_status_t disconnect(RawAddress* bd_addr, tBLE_ADDR_TYPE addr_type,
		p_dev->dev_status = BTHH_CONN_STATE_DISCONNECTED;

		if (com::android::bluetooth::flags::pending_hid_connection_cancellation()) {
		btif_hh_cb.pending_connections.remove(link_spec);
		btif_hh_cb.new_connection_requests.remove(link_spec);
		}
		return BT_STATUS_DONE;
		} else if (com::android::bluetooth::flags::initiate_multiple_hid_connections() &&
		std::find(btif_hh_cb.pending_connections.begin(),
		btif_hh_cb.pending_connections.end(),
		link_spec) != btif_hh_cb.pending_connections.end()) {
		btif_hh_cb.pending_connections.remove(link_spec);
		std::find(btif_hh_cb.new_connection_requests.begin(),
		btif_hh_cb.new_connection_requests.end(),
		link_spec) != btif_hh_cb.new_connection_requests.end()) {
		btif_hh_cb.new_connection_requests.remove(link_spec);
		log::info("Pending connection cancelled {}", link_spec);
		return BT_STATUS_SUCCESS;
		}
		@@ -1697,7 +1698,7 @@ static bt_status_t virtual_unplug(RawAddress* bd_addr, tBLE_ADDR_TYPE addr_type,
		btif_hh_device_t* p_dev = btif_hh_find_dev_by_link_spec(link_spec);
		if (com::android::bluetooth::flags::remove_input_device_on_vup()) {
		bool pending_connection = false;
		for (auto ls : btif_hh_cb.pending_connections) {
		for (auto ls : btif_hh_cb.new_connection_requests) {
		if (ls.addrt.bda == link_spec.addrt.bda) {
		pending_connection = true;
		break;
		@@ -2107,7 +2108,7 @@ static void cleanup(void) {
		btif_hh_cb.service_dereg_active = FALSE;
		btif_disable_service(BTA_HID_SERVICE_ID);
		}
		btif_hh_cb.pending_connections.clear();
		btif_hh_cb.new_connection_requests.clear();
		for (i = 0; i < BTIF_HH_MAX_HID; i++) {
		p_dev = &btif_hh_cb.devices[i];
		int fd = (com::android::bluetooth::flags::hid_report_queuing() ? p_dev->internal_send_fd
		@@ -2193,7 +2194,7 @@ void DumpsysHid(int fd) {
		LOG_DUMPSYS(fd, "status:%s num_devices:%u", btif_hh_status_text(btif_hh_cb.status).c_str(),
		btif_hh_cb.device_num);
		LOG_DUMPSYS(fd, "status:%s", btif_hh_status_text(btif_hh_cb.status).c_str());
		for (auto link_spec : btif_hh_cb.pending_connections) {
		for (auto link_spec : btif_hh_cb.new_connection_requests) {
		LOG_DUMPSYS(fd, "Pending connection: %s", link_spec.ToRedactedStringForLogging().c_str());
		}
		for (unsigned i = 0; i < BTIF_HH_MAX_HID; i++) {