Commit c6b9ea87 authored Feb 02, 2024 by Łukasz Rymanowski

csis: Fix notification of device available on startup

It might happen that native Csis module will start later than Group module and
in this case `onDeviceAvailable` callback will not be called, as at this
point of time, Rank is not known.
Rank being not available at this point is fine as after connection Rank
will be updated.

This might result in invalid device represantation in GUI as Java is not
aware about grouping.

Note, with this patch behavior will match to the one when native Group
module starts before Csis module.

Bug: 312997962
Test: atest bluetooth_csis_test
Flags: Exempt, simple fix, regression verified with unit tests
Change-Id: I69e50e5e046730b6dcf51e12d008f1064f4e8e8c

parent c148cf66

system/bta/csis/csis_client.cc

+4 −6

Original line number	Diff line number	Diff line
		@@ -233,16 +233,14 @@ class CsisClientImpl : public CsisClient {
		csis_group->SetUuid(uuid);
		}

		int rank = bluetooth::csis::CSIS_RANK_INVALID;
		auto csis_instance = device->GetCsisInstanceByGroupId(group_id);
		if (!csis_instance) {
		LOG_ERROR(" device: %s, does not have the rank info for group (id: %d )",
		ADDRESS_TO_LOGGABLE_CSTR(address), group_id);
		return;
		if (csis_instance) {
		rank = csis_instance->GetRank();
		}

		callbacks_->OnDeviceAvailable(device->addr, csis_group->GetGroupId(),
		csis_group->GetDesiredSize(),
		csis_instance->GetRank(), uuid);
		csis_group->GetDesiredSize(), rank, uuid);
		}

		void Connect(const RawAddress& address) override {