Merge "Remove timer when connection is cancelled" (f08abaa8) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/hci/acl_manager/le_impl.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -647,7 +647,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback {
		return;
		}
		if (connect_list.empty()) {
		LOG_ERROR("Attempting to re-arm le connection state machine when filter accept list is empty");
		LOG_INFO("Ignored request to re-arm le connection state machine when filter accept list is empty");
		return;
		}
		AddressWithType empty(Address::kEmpty, AddressType::RANDOM_DEVICE_ADDRESS);
		@@ -847,6 +847,11 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback {
		}

		void cancel_connect(AddressWithType address_with_type) {
		// Remove any alarms for this peer, if any
		if (create_connection_timeout_alarms_.find(address_with_type) != create_connection_timeout_alarms_.end()) {
		create_connection_timeout_alarms_.at(address_with_type).Cancel();
		create_connection_timeout_alarms_.erase(address_with_type);
		}
		// the connection will be canceled by LeAddressManager.OnPause()
		remove_device_from_connect_list(address_with_type);
		}