Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d60e27d5 authored May 03, 2023 by Rahul Sabnis Committed by Automerger Merge Worker May 03, 2023

Merge "leaudio: Add App id to dumpsys" am: 8e163bd8

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2573536

Change-Id: Ib8d5d671f9a8cb6cc277bcd58c650fce2a1a346d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b09f10f3 8e163bd8

system/bta/csis/csis_client.cc

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -692,7 +692,8 @@ class CsisClientImpl : public CsisClient {
	void Dump(int fd) {		void Dump(int fd) {
	std::stringstream stream;		std::stringstream stream;

	stream << " Groups\n";		stream << " APP ID: " << +gatt_if_ << "\n"
			<< " Groups:\n";
	for (const auto& g : csis_groups_) {		for (const auto& g : csis_groups_) {
	stream << " == id: " << g->GetGroupId() << " ==\n"		stream << " == id: " << g->GetGroupId() << " ==\n"
	<< " uuid: " << g->GetUuid() << "\n"		<< " uuid: " << g->GetUuid() << "\n"

system/bta/has/has_client.cc

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -909,6 +909,7 @@ class HasClientImpl : public HasClient {

	void Dump(int fd) const {		void Dump(int fd) const {
	std::stringstream stream;		std::stringstream stream;
			stream << " APP ID: " << +gatt_if_ << " \n";
	if (devices_.size()) {		if (devices_.size()) {
	stream << " {\"Known HAS devices\": [";		stream << " {\"Known HAS devices\": [";
	for (const auto& device : devices_) {		for (const auto& device : devices_) {

system/bta/le_audio/client.cc

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -3478,6 +3478,7 @@ class LeAudioClientImpl : public LeAudioClient {
	}		}

	void Dump(int fd) {		void Dump(int fd) {
			dprintf(fd, " APP ID: %d \n", gatt_if_);
	dprintf(fd, " Active group: %d\n", active_group_id_);		dprintf(fd, " Active group: %d\n", active_group_id_);
	dprintf(fd, " reconnection mode: %s \n",		dprintf(fd, " reconnection mode: %s \n",
	(reconnection_mode_ == BTM_BLE_BKG_CONNECT_ALLOW_LIST		(reconnection_mode_ == BTM_BLE_BKG_CONNECT_ALLOW_LIST

system/bta/vc/vc.cc

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -621,7 +621,10 @@ class VolumeControlImpl : public VolumeControl {
	instance->OnGattWriteCcc(connection_id, status, handle, len, value, data);		instance->OnGattWriteCcc(connection_id, status, handle, len, value, data);
	}		}

	void Dump(int fd) { volume_control_devices_.DebugDump(fd); }		void Dump(int fd) {
			dprintf(fd, "APP ID: %d\n", gatt_if_);
			volume_control_devices_.DebugDump(fd);
			}

	void Disconnect(const RawAddress& address) override {		void Disconnect(const RawAddress& address) override {
	VolumeControlDevice* device =		VolumeControlDevice* device =