Merge "rootcanal: Check return values from callbacks" (484de62b) · Commits · e / os / android_packages_modules_Bluetooth

system/test/rootcanal/bluetooth_hci.cc

+57 −27

Original line number	Diff line number	Diff line
		@@ -81,10 +81,13 @@ Return<void> BluetoothHci::initialize(const sp<IBluetoothHciCallbacks>& cb) {
		}

		death_recipient_->setHasDied(false);
		cb->linkToDeath(death_recipient_, 0);
		auto link_ret = cb->linkToDeath(death_recipient_, 0);
		CHECK(link_ret.isOk()) << "Error calling linkToDeath.";

		test_channel_transport_.RegisterCommandHandler([this](const std::string& name, const std::vector<std::string>& args) {
		async_manager_.ExecAsync(std::chrono::milliseconds(0),
		test_channel_transport_.RegisterCommandHandler(
		[this](const std::string& name, const std::vector<std::string>& args) {
		async_manager_.ExecAsync(
		std::chrono::milliseconds(0),
		[this, name, args]() { test_channel_.HandleCommand(name, args); });
		});

		@@ -92,31 +95,49 @@ Return<void> BluetoothHci::initialize(const sp<IBluetoothHciCallbacks>& cb) {

		controller_->Initialize({"dmc", "3C:5A:B4:01:02:03"});

		controller_->RegisterEventChannel([cb](std::shared_ptr<std::vector<uint8_t>> packet) {
		controller_->RegisterEventChannel(
		[this, cb](std::shared_ptr<std::vector<uint8_t>> packet) {
		hidl_vec<uint8_t> hci_event(packet->begin(), packet->end());
		cb->hciEventReceived(hci_event);
		auto ret = cb->hciEventReceived(hci_event);
		if (!ret.isOk()) {
		CHECK(death_recipient_->getHasDied())
		<< "Error sending event callback, but no death notification.";
		}
		});

		controller_->RegisterAclChannel([cb](std::shared_ptr<std::vector<uint8_t>> packet) {
		controller_->RegisterAclChannel(
		[this, cb](std::shared_ptr<std::vector<uint8_t>> packet) {
		hidl_vec<uint8_t> acl_packet(packet->begin(), packet->end());
		cb->aclDataReceived(acl_packet);
		auto ret = cb->aclDataReceived(acl_packet);
		if (!ret.isOk()) {
		CHECK(death_recipient_->getHasDied())
		<< "Error sending acl callback, but no death notification.";
		}
		});

		controller_->RegisterScoChannel([cb](std::shared_ptr<std::vector<uint8_t>> packet) {
		controller_->RegisterScoChannel(
		[this, cb](std::shared_ptr<std::vector<uint8_t>> packet) {
		hidl_vec<uint8_t> sco_packet(packet->begin(), packet->end());
		cb->aclDataReceived(sco_packet);
		auto ret = cb->aclDataReceived(sco_packet);
		if (!ret.isOk()) {
		CHECK(death_recipient_->getHasDied())
		<< "Error sending sco callback, but no death notification.";
		}
		});

		controller_->RegisterTaskScheduler([this](std::chrono::milliseconds delay, const TaskCallback& task) {
		controller_->RegisterTaskScheduler(
		[this](std::chrono::milliseconds delay, const TaskCallback& task) {
		return async_manager_.ExecAsync(delay, task);
		});

		controller_->RegisterPeriodicTaskScheduler(
		[this](std::chrono::milliseconds delay, std::chrono::milliseconds period, const TaskCallback& task) {
		[this](std::chrono::milliseconds delay, std::chrono::milliseconds period,
		const TaskCallback& task) {
		return async_manager_.ExecAsyncPeriodically(delay, period, task);
		});

		controller_->RegisterTaskCancel([this](AsyncTaskId task) { async_manager_.CancelAsyncTask(task); });
		controller_->RegisterTaskCancel(
		[this](AsyncTaskId task) { async_manager_.CancelAsyncTask(task); });

		test_model_.Reset();
		// Add the controller as a device in the model.
		@@ -130,14 +151,23 @@ Return<void> BluetoothHci::initialize(const sp<IBluetoothHciCallbacks>& cb) {
		6311, [this](int fd) { test_model_.IncomingLinkLayerConnection(fd); });
		}

		unlink_cb_ = [cb](sp<BluetoothDeathRecipient>& death_recipient) {
		unlink_cb_ = [this, cb](sp<BluetoothDeathRecipient>& death_recipient) {
		if (death_recipient->getHasDied())
		ALOGI("Skipping unlink call, service died.");
		else
		cb->unlinkToDeath(death_recipient);
		else {
		auto ret = cb->unlinkToDeath(death_recipient);
		if (!ret.isOk()) {
		CHECK(death_recipient_->getHasDied())
		<< "Error calling unlink, but no death notification.";
		}
		}
		};

		cb->initializationComplete(Status::SUCCESS);
		auto init_ret = cb->initializationComplete(Status::SUCCESS);
		if (!init_ret.isOk()) {
		CHECK(death_recipient_->getHasDied())
		<< "Error sending init callback, but no death notification.";
		}
		return Void();
		}