Merge "LeAudio: Fix timing issue on state machine reconfigure" into tm-qpr-dev (10a908cf) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/le_audio/devices.cc

+17 −9

Original line number	Diff line number	Diff line
		@@ -1478,8 +1478,18 @@ bool LeAudioDevice::ConfigureAses(
		types::AudioLocations& group_src_audio_locations, bool reuse_cis_id,
		AudioContexts metadata_context_type,
		const std::vector<uint8_t>& ccid_list) {
		struct ase* ase = GetFirstInactiveAse(ent.direction, reuse_cis_id);
		if (!ase) return false;
		/* First try to use the already configured ASE */
		auto ase = GetFirstActiveAseByDirection(ent.direction);
		if (ase) {
		LOG_INFO("Using an already active ASE id=%d", ase->id);
		} else {
		ase = GetFirstInactiveAse(ent.direction, reuse_cis_id);
		}

		if (!ase) {
		LOG_ERROR("Unable to find an ASE to configure");
		return false;
		}

		uint8_t active_ases = *number_of_already_active_group_ase;
		uint8_t max_required_ase_per_dev =
		@@ -1551,8 +1561,12 @@ bool LeAudioDevice::ConfigureAses(
		(ent.direction == 1 ? "snk" : "src"), ase->max_sdu_size, ase->cis_id,
		ent.target_latency);

		/* Try to use the already active ASE */
		ase = GetNextActiveAseWithSameDirection(ase);
		if (ase == nullptr) {
		ase = GetFirstInactiveAse(ent.direction, reuse_cis_id);
		}
		}

		*number_of_already_active_group_ase = active_ases;
		return true;
		@@ -1603,12 +1617,6 @@ bool LeAudioDeviceGroup::ConfigureAses(
		for (auto* device = GetFirstDeviceWithActiveContext(context_type);
		device != nullptr && required_device_cnt > 0;
		device = GetNextDeviceWithActiveContext(device, context_type)) {
		/* Skip if device has ASE configured in this direction already */
		if (device->GetFirstActiveAseByDirection(ent.direction)) {
		required_device_cnt--;
		continue;
		}

		/* For the moment, we configure only connected devices and when it is
		* ready to stream i.e. All ASEs are discovered and device is reported as
		* connected