leaudio: Yet another reconnection improvement am: fe3c0d7941 am: 88189b7263 (443ddcdf) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/le_audio/client.cc

+51 −0

Original line number	Diff line number	Diff line
		@@ -1783,6 +1783,11 @@ class LeAudioClientImpl : public LeAudioClient {

		BTM_RequestPeerSCA(leAudioDevice->address_, transport);

		/* Remove device from the background connect (it might be either Allow list
		* or TA) and it will be added back on disconnection
		*/
		BTA_GATTC_CancelOpen(gatt_if_, address, false);

		if (leAudioDevice->GetConnectionState() ==
		DeviceConnectState::CONNECTING_AUTOCONNECT) {
		leAudioDevice->SetConnectionState(
		@@ -1939,6 +1944,44 @@ class LeAudioClientImpl : public LeAudioClient {
		&le_audio::uuid::kPublishedAudioCapabilityServiceUuid);
		}

		void checkGroupStreamingStateAfterMemberDisconnect(int group_id) {
		/* This is fired t=kGroupStreamingWatchDelayMs after group member
		* got disconencted while group was streaming.
		* We want to check here if group keeps streaming so we should add other
		* group members to allow list for better reconnection experiance. If group
		* is not streaming e.g. devices intentionally disconnected for other
		* purposes like pairing with other device, then we do nothing here and
		* device stay on the default reconnection policy (i.e. targeted
		* announcements)
		*/
		auto group = aseGroups_.FindById(group_id);
		if (group == nullptr \|\| !group->IsStreaming()) {
		LOG_INFO("Group %d is not streaming", group_id);
		return;
		}

		/* if group is still streaming, make sure that other not connected
		* set members are in the allow list for the quick reconnect.
		* E.g. for the earbud case, probably one of the earbud is in the case now.
		*/
		group->AddToAllowListNotConnectedGroupMembers(gatt_if_);
		}

		void scheduleGroupStreamingCheck(int group_id) {
		LOG_INFO("Schedule group_id %d streaming check.", group_id);
		do_in_main_thread_delayed(
		FROM_HERE,
		base::BindOnce(
		&LeAudioClientImpl::checkGroupStreamingStateAfterMemberDisconnect,
		base::Unretained(this), group_id),
		#if BASE_VER < 931007
		base::TimeDelta::FromMilliseconds(kGroupStreamingWatchDelayMs)
		#else
		base::Milliseconds(kDeviceAttachDelayMs)
		#endif
		);
		}

		void OnGattDisconnected(uint16_t conn_id, tGATT_IF client_if,
		RawAddress address, tGATT_DISCONN_REASON reason) {
		LeAudioDevice* leAudioDevice = leAudioDevices_.FindByAddress(address);
		@@ -1990,6 +2033,13 @@ class LeAudioClientImpl : public LeAudioClient {
		AddToBackgroundConnectCheckStreaming(leAudioDevice);
		} else {
		BTA_GATTC_Open(gatt_if_, address, reconnection_mode_, false);
		if (group->IsStreaming()) {
		/* If all set is disconnecting, let's give it some time.
		* If not all get disconnected, and group will keep streaming
		* we want to put disconnected devices to allow list
		*/
		scheduleGroupStreamingCheck(leAudioDevice->group_id_);
		}
		}
		} else {
		leAudioDevice->SetConnectionState(DeviceConnectState::DISCONNECTED);
		@@ -4852,6 +4902,7 @@ class LeAudioClientImpl : public LeAudioClient {

		/* Reconnection mode */
		tBTM_BLE_CONN_TYPE reconnection_mode_;
		static constexpr uint64_t kGroupStreamingWatchDelayMs = 3000;

		static constexpr char kNotifyUpperLayerAboutGroupBeingInIdleDuringCall[] =
		"persist.bluetooth.leaudio.notify.idle.during.call";

system/bta/le_audio/devices.cc

+4 −0

Original line number	Diff line number	Diff line
		@@ -907,6 +907,10 @@ bool LeAudioDeviceGroup::IsInTransition(void) {
		return target_state_ != current_state_;
		}

		bool LeAudioDeviceGroup::IsStreaming(void) {
		return current_state_ == AseState::BTA_LE_AUDIO_ASE_STATE_STREAMING;
		}

		bool LeAudioDeviceGroup::IsReleasingOrIdle(void) {
		return (target_state_ == AseState::BTA_LE_AUDIO_ASE_STATE_IDLE) \|\|
		(current_state_ == AseState::BTA_LE_AUDIO_ASE_STATE_IDLE);

system/bta/le_audio/devices.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -405,6 +405,7 @@ class LeAudioDeviceGroup {
		}

		bool IsInTransition(void);
		bool IsStreaming(void);
		bool IsReleasingOrIdle(void);

		void PrintDebugState(void);

system/bta/le_audio/le_audio_client_test.cc

+5 −4

Original line number	Diff line number	Diff line
		@@ -4073,10 +4073,11 @@ TEST_F(UnicastTest, TwoEarbuds2ndDisconnected) {
		InjectCisDisconnected(group_id, ase.cis_conn_hdl);
		}

		EXPECT_CALL(mock_gatt_interface_,
		Open(_, device->address_,
		BTM_BLE_BKG_CONNECT_TARGETED_ANNOUNCEMENTS, false))
		.Times(1);
		/* It is called twice. Once with BTM_BLE_BKG_CONNECT_TARGETED_ANNOUNCEMENTS,
		* and then after delay with BTM_BLE_BKG_CONNECT_ALLOW_LIST
		*/
		EXPECT_CALL(mock_gatt_interface_, Open(_, device->address_, _, false))
		.Times(2);

		// Record NumOfConnected when groupStateMachine_ gets notified about the
		// disconnection