Merge "Convert the unified_connection_manager flag" into main (6a95a263) · Commits · e / os / android_packages_modules_Bluetooth

android/app/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -134,6 +134,7 @@ cc_library_shared {
	"libcutils",		"libcutils",
	"libevent",		"libevent",
	"libexpresslog",		"libexpresslog",
			"libflags_rust_cpp_bridge",
	"libflatbuffers-cpp",		"libflatbuffers-cpp",
	"libfmq",		"libfmq",
	"libg722codec",		"libg722codec",

system/audio_hal_interface/fuzzer/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,7 @@ cc_defaults {
	"libcutils",		"libcutils",
	"libevent",		"libevent",
	"libexpresslog",		"libexpresslog",
			"libflags_rust_cpp_bridge",
	"libg722codec",		"libg722codec",
	"libhidlbase",		"libhidlbase",
	"libjsoncpp",		"libjsoncpp",

system/btif/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -325,6 +325,7 @@ cc_test {
	"libchrome",		"libchrome",
	"libcom.android.sysprop.bluetooth.wrapped",		"libcom.android.sysprop.bluetooth.wrapped",
	"libevent",		"libevent",
			"libflags_rust_cpp_bridge",
	"libflagtest",		"libflagtest",
	"libflatbuffers-cpp",		"libflatbuffers-cpp",
	"libfmq",		"libfmq",

system/main/shim/acl.cc

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@
	#include <base/location.h>		#include <base/location.h>
	#include <base/strings/stringprintf.h>		#include <base/strings/stringprintf.h>
	#include <bluetooth/log.h>		#include <bluetooth/log.h>
			#include <com_android_bluetooth_flags.h>
	#include <time.h>		#include <time.h>

	#include <chrono>		#include <chrono>
	@@ -36,7 +37,6 @@
	#include <vector>		#include <vector>

	#include "common/bind.h"		#include "common/bind.h"
	#include "common/init_flags.h"
	#include "common/interfaces/ILoggable.h"		#include "common/interfaces/ILoggable.h"
	#include "common/strings.h"		#include "common/strings.h"
	#include "common/sync_map_count.h"		#include "common/sync_map_count.h"
	@@ -1006,7 +1006,7 @@ struct shim::Acl::impl {
	auto connection = handle_to_le_connection_map_.find(handle);		auto connection = handle_to_le_connection_map_.find(handle);
	if (connection != handle_to_le_connection_map_.end()) {		if (connection != handle_to_le_connection_map_.end()) {
	auto remote_address_with_type = connection->second->GetRemoteAddressWithType();		auto remote_address_with_type = connection->second->GetRemoteAddressWithType();
	if (!common::init_flags::use_unified_connection_manager_is_enabled()) {		if (!com::android::bluetooth::flags::unified_connection_manager()) {
	GetAclManager()->RemoveFromBackgroundList(remote_address_with_type);		GetAclManager()->RemoveFromBackgroundList(remote_address_with_type);
	}		}
	connection->second->InitiateDisconnect(ToDisconnectReasonFromLegacy(reason));		connection->second->InitiateDisconnect(ToDisconnectReasonFromLegacy(reason));

system/rust/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -73,6 +73,7 @@ rust_library {
	crate_name: "bluetooth_core_rs_for_facade",		crate_name: "bluetooth_core_rs_for_facade",
	defaults: ["libbluetooth_core_rs_defaults"],		defaults: ["libbluetooth_core_rs_defaults"],
	rustlibs: [		rustlibs: [
			"libbluetooth_aconfig_flags_rust",
	"libtokio",		"libtokio",
	],		],
	host_supported: true,		host_supported: true,
	@@ -83,6 +84,7 @@ rust_ffi_static {
	crate_name: "bluetooth_core",		crate_name: "bluetooth_core",
	defaults: ["libbluetooth_core_rs_defaults"],		defaults: ["libbluetooth_core_rs_defaults"],
	rustlibs: [		rustlibs: [
			"libbluetooth_aconfig_flags_rust",
	"libtokio",		"libtokio",
	],		],
	target: {		target: {
	@@ -99,6 +101,7 @@ rust_test_host {
	name: "libbluetooth_core_rs_test",		name: "libbluetooth_core_rs_test",
	defaults: ["libbluetooth_core_rs_defaults"],		defaults: ["libbluetooth_core_rs_defaults"],
	rustlibs: [		rustlibs: [
			"libbluetooth_aconfig_flags_rust",
	"libtokio_for_test",		"libtokio_for_test",
	"libtokio_test",		"libtokio_test",
	],		],