Merge changes from topic "revert-3315276-VNGBAEHITV" into main (ad6cf89c) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -260,7 +260,6 @@ cc_test {
	":TestMockStackAvdt",		":TestMockStackAvdt",
	":TestMockStackAvrc",		":TestMockStackAvrc",
	":TestMockStackBtm",		":TestMockStackBtm",
	":TestMockStackConnMgr",
	":TestMockStackGap",		":TestMockStackGap",
	":TestMockStackGatt",		":TestMockStackGatt",
	":TestMockStackHid",		":TestMockStackHid",

system/bta/dm/bta_dm_act.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,7 @@
	#include "main/shim/entry.h"		#include "main/shim/entry.h"
	#include "osi/include/allocator.h"		#include "osi/include/allocator.h"
	#include "osi/include/properties.h"		#include "osi/include/properties.h"
	#include "stack/connection_manager/connection_manager.h"		#include "stack/gatt/connection_manager.h"
	#include "stack/include/acl_api.h"		#include "stack/include/acl_api.h"
	#include "stack/include/bt_hdr.h"		#include "stack/include/bt_hdr.h"
	#include "stack/include/bt_types.h"		#include "stack/include/bt_types.h"

system/btif/src/bluetooth.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,7 @@
	#include "osi/include/wakelock.h"		#include "osi/include/wakelock.h"
	#include "stack/btm/btm_dev.h"		#include "stack/btm/btm_dev.h"
	#include "stack/btm/btm_sco_hfp_hal.h"		#include "stack/btm/btm_sco_hfp_hal.h"
	#include "stack/connection_manager/connection_manager.h"		#include "stack/gatt/connection_manager.h"
	#include "stack/include/a2dp_api.h"		#include "stack/include/a2dp_api.h"
	#include "stack/include/avct_api.h"		#include "stack/include/avct_api.h"
	#include "stack/include/avdt_api.h"		#include "stack/include/avdt_api.h"

system/stack/Android.bp

+6 −9

Original line number	Original line	Diff line number	Diff line
	@@ -275,11 +275,11 @@ cc_library_static {
	"btm/security_event_parser.cc",		"btm/security_event_parser.cc",
	"btu/btu_event.cc",		"btu/btu_event.cc",
	"btu/btu_hcif.cc",		"btu/btu_hcif.cc",
	"connection_manager/connection_manager.cc",
	"eatt/eatt.cc",		"eatt/eatt.cc",
	"gap/gap_ble.cc",		"gap/gap_ble.cc",
	"gap/gap_conn.cc",		"gap/gap_conn.cc",
	"gatt/att_protocol.cc",		"gatt/att_protocol.cc",
			"gatt/connection_manager.cc",
	"gatt/gatt_api.cc",		"gatt/gatt_api.cc",
	"gatt/gatt_attr.cc",		"gatt/gatt_attr.cc",
	"gatt/gatt_auth.cc",		"gatt/gatt_auth.cc",
	@@ -540,7 +540,6 @@ cc_fuzz {
	":TestMockStackAcl",		":TestMockStackAcl",
	":TestMockStackArbiter",		":TestMockStackArbiter",
	":TestMockStackBtm",		":TestMockStackBtm",
	":TestMockStackConnMgr",
	":TestMockStackHcic",		":TestMockStackHcic",
	":TestMockStackL2cap",		":TestMockStackL2cap",
	":TestMockStackMetrics",		":TestMockStackMetrics",
	@@ -1068,7 +1067,7 @@ cc_test {

	// Bluetooth stack connection multiplexing		// Bluetooth stack connection multiplexing
	cc_test {		cc_test {
	name: "net_test_conn_multiplexing",		name: "net_test_gatt_conn_multiplexing",
	defaults: [		defaults: [
	"fluoride_defaults",		"fluoride_defaults",
	"mts_defaults",		"mts_defaults",
	@@ -1087,9 +1086,9 @@ cc_test {
	srcs: [		srcs: [
	":TestCommonMainHandler",		":TestCommonMainHandler",
	":TestMockStackBtmInterface",		":TestMockStackBtmInterface",
	"connection_manager/connection_manager.cc",		"gatt/connection_manager.cc",
	"test/common/mock_btm_api_layer.cc",		"test/common/mock_btm_api_layer.cc",
	"test/connection_manager_test.cc",		"test/gatt_connection_manager_test.cc",
	],		],
	shared_libs: [		shared_libs: [
	"libcutils",		"libcutils",
	@@ -1653,7 +1652,6 @@ cc_test {
	":TestMockMainShimEntry",		":TestMockMainShimEntry",
	":TestMockRustFfi",		":TestMockRustFfi",
	":TestMockStackBtu",		":TestMockStackBtu",
	":TestMockStackConnMgr",
	":TestMockStackGap",		":TestMockStackGap",
	":TestMockStackGatt",		":TestMockStackGatt",
	":TestMockStackHcic",		":TestMockStackHcic",
	@@ -1974,9 +1972,9 @@ cc_test {
	":TestMockStackSmp",		":TestMockStackSmp",
	"ais/ais_ble.cc",		"ais/ais_ble.cc",
	"arbiter/acl_arbiter.cc",		"arbiter/acl_arbiter.cc",
	"connection_manager/connection_manager.cc",
	"eatt/eatt.cc",		"eatt/eatt.cc",
	"gatt/att_protocol.cc",		"gatt/att_protocol.cc",
			"gatt/connection_manager.cc",
	"gatt/gatt_api.cc",		"gatt/gatt_api.cc",
	"gatt/gatt_attr.cc",		"gatt/gatt_attr.cc",
	"gatt/gatt_auth.cc",		"gatt/gatt_auth.cc",
	@@ -2069,7 +2067,7 @@ cc_test {
	":TestMockMainShimEntry",		":TestMockMainShimEntry",
	":TestMockStackAcl",		":TestMockStackAcl",
	":TestMockStackBtm",		":TestMockStackBtm",
	":TestMockStackConnMgr",		":TestMockStackGatt",
	":TestMockStackHcic",		":TestMockStackHcic",
	":TestMockStackSdp",		":TestMockStackSdp",
	":TestMockStackSmp",		":TestMockStackSmp",
	@@ -2166,7 +2164,6 @@ cc_test {
	":TestMockRustFfi",		":TestMockRustFfi",
	":TestMockStackBtm",		":TestMockStackBtm",
	":TestMockStackBtu",		":TestMockStackBtu",
	":TestMockStackConnMgr",
	":TestMockStackGatt",		":TestMockStackGatt",
	":TestMockStackHcic",		":TestMockStackHcic",
	":TestMockStackL2cap",		":TestMockStackL2cap",

system/stack/BUILD.gn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -125,7 +125,7 @@ source_set("stack") {
	"gap/gap_ble.cc",		"gap/gap_ble.cc",
	"gap/gap_conn.cc",		"gap/gap_conn.cc",
	"gatt/att_protocol.cc",		"gatt/att_protocol.cc",
	"connection_manager/connection_manager.cc",		"gatt/connection_manager.cc",
	"gatt/gatt_api.cc",		"gatt/gatt_api.cc",
	"gatt/gatt_attr.cc",		"gatt/gatt_attr.cc",
	"gatt/gatt_auth.cc",		"gatt/gatt_auth.cc",