Merge "ABS volume support is not informed to Audio sometimes" into main (3754e4c3) · Commits · e / os / android_packages_modules_Bluetooth

system/profile/avrcp/connection_handler.cc

+16 −0

Original line number	Diff line number	Diff line
		@@ -148,6 +148,22 @@ bool ConnectionHandler::ConnectDevice(const RawAddress& bdaddr) {
		}

		instance_->feature_map_[bdaddr] = features;

		if (com::android::bluetooth::flags::abs_volume_sdp_conflict()) {
		// Peer may connect avrcp during SDP. Check the connection state when
		// SDP completed to resolve the conflict.
		for (const auto& pair : instance_->device_map_) {
		if (bdaddr == pair.second->GetAddress()) {
		log::warn("Connected by peer device with address {}", bdaddr);
		if (features & BTA_AV_FEAT_ADV_CTRL) {
		pair.second->RegisterVolumeChanged();
		} else if (instance_->vol_ != nullptr) {
		instance_->vol_->DeviceConnected(pair.second->GetAddress());
		}
		return;
		}
		}
		}
		instance_->AvrcpConnect(true, bdaddr);
		return;
		};