Snap for 7233012 from c53d420ecb811b12637819f0047a279004a09531 to sc-release (188a6dc6) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/test/common/mock_stack_acl.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -425,7 +425,6 @@ void btm_set_link_policy(tACL_CONN* conn, tLINK_POLICY policy) {
		mock_function_count_map[__func__]++;
		}
		void btm_set_packet_types_from_address(const RawAddress& bd_addr,
		tBT_TRANSPORT transport,
		uint16_t pkt_types) {
		mock_function_count_map[__func__]++;
		}

system/gd/common/init_flags.fbs

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ table InitFlagsData {
		gd_hci_enabled:bool;
		gd_controller_enabled:bool;
		gd_core_enabled:bool;
		btaa_hci_log_enabled:bool;
		}

		root_type InitFlagsData;

system/gd/dumpsys/init_flags.cc

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,5 +30,6 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl
		builder.add_gd_hci_enabled(bluetooth::common::init_flags::gd_hci_is_enabled());
		builder.add_gd_controller_enabled(bluetooth::common::init_flags::gd_controller_is_enabled());
		builder.add_gd_core_enabled(bluetooth::common::init_flags::gd_core_is_enabled());
		builder.add_btaa_hci_log_enabled(bluetooth::common::init_flags::btaa_hci_is_enabled());
		return builder.Finish();
		}

system/gd/hal/hci_hal_android_hidl.cc

+25 −8

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <vector>

		#include "btaa/activity_attribution.h"
		#include "common/init_flags.h"
		#include "common/stop_watch.h"
		#include "common/strings.h"
		#include "hal/hci_hal.h"
		@@ -90,7 +91,9 @@ class InternalHciCallbacks : public IBluetoothHciCallbacks {
		common::StopWatch(GetTimerText(__func__, event));
		std::vector<uint8_t> received_hci_packet(event.begin(), event.end());
		btsnoop_logger_->Capture(received_hci_packet, SnoopLogger::Direction::INCOMING, SnoopLogger::PacketType::EVT);
		if (common::init_flags::btaa_hci_is_enabled()) {
		btaa_logger_->Capture(received_hci_packet, SnoopLogger::PacketType::EVT);
		}
		if (callback_ != nullptr) {
		callback_->hciEventReceived(std::move(received_hci_packet));
		}
		@@ -101,7 +104,9 @@ class InternalHciCallbacks : public IBluetoothHciCallbacks {
		common::StopWatch(GetTimerText(__func__, data));
		std::vector<uint8_t> received_hci_packet(data.begin(), data.end());
		btsnoop_logger_->Capture(received_hci_packet, SnoopLogger::Direction::INCOMING, SnoopLogger::PacketType::ACL);
		if (common::init_flags::btaa_hci_is_enabled()) {
		btaa_logger_->Capture(received_hci_packet, SnoopLogger::PacketType::ACL);
		}
		if (callback_ != nullptr) {
		callback_->aclDataReceived(std::move(received_hci_packet));
		}
		@@ -112,7 +117,9 @@ class InternalHciCallbacks : public IBluetoothHciCallbacks {
		common::StopWatch(GetTimerText(__func__, data));
		std::vector<uint8_t> received_hci_packet(data.begin(), data.end());
		btsnoop_logger_->Capture(received_hci_packet, SnoopLogger::Direction::INCOMING, SnoopLogger::PacketType::SCO);
		if (common::init_flags::btaa_hci_is_enabled()) {
		btaa_logger_->Capture(received_hci_packet, SnoopLogger::PacketType::SCO);
		}
		if (callback_ != nullptr) {
		callback_->scoDataReceived(std::move(received_hci_packet));
		}
		@@ -151,21 +158,27 @@ class HciHalHidl : public HciHal {
		void sendHciCommand(HciPacket command) override {
		common::StopWatch(GetTimerText(__func__, command));
		btsnoop_logger_->Capture(command, SnoopLogger::Direction::OUTGOING, SnoopLogger::PacketType::CMD);
		if (common::init_flags::btaa_hci_is_enabled()) {
		btaa_logger_->Capture(command, SnoopLogger::PacketType::CMD);
		}
		bt_hci_->sendHciCommand(command);
		}

		void sendAclData(HciPacket packet) override {
		common::StopWatch(GetTimerText(__func__, packet));
		btsnoop_logger_->Capture(packet, SnoopLogger::Direction::OUTGOING, SnoopLogger::PacketType::ACL);
		if (common::init_flags::btaa_hci_is_enabled()) {
		btaa_logger_->Capture(packet, SnoopLogger::PacketType::ACL);
		}
		bt_hci_->sendAclData(packet);
		}

		void sendScoData(HciPacket packet) override {
		common::StopWatch(GetTimerText(__func__, packet));
		btsnoop_logger_->Capture(packet, SnoopLogger::Direction::OUTGOING, SnoopLogger::PacketType::SCO);
		if (common::init_flags::btaa_hci_is_enabled()) {
		btaa_logger_->Capture(packet, SnoopLogger::PacketType::SCO);
		}
		bt_hci_->sendScoData(packet);
		}

		@@ -183,11 +196,15 @@ class HciHalHidl : public HciHal {
		protected:
		void ListDependencies(ModuleList* list) override {
		list->add<SnoopLogger>();
		if (common::init_flags::btaa_hci_is_enabled()) {
		list->add<activity_attribution::ActivityAttribution>();
		}
		}

		void Start() override {
		if (common::init_flags::btaa_hci_is_enabled()) {
		btaa_logger_ = GetDependency<activity_attribution::ActivityAttribution>();
		}
		btsnoop_logger_ = GetDependency<SnoopLogger>();

		bt_hci_1_1_ = IBluetoothHci::getService();

system/main/test/common/mock_stack_acl.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -424,7 +424,6 @@ void btm_set_link_policy(tACL_CONN* conn, tLINK_POLICY policy) {
		mock_function_count_map[__func__]++;
		}
		void btm_set_packet_types_from_address(const RawAddress& bd_addr,
		tBT_TRANSPORT transport,
		uint16_t pkt_types) {
		mock_function_count_map[__func__]++;
		}