Merge changes I35fefd23,Idaa677cb,If3a263d4 am: 422e5ab1ac am: 8efccddb4e (cb60a8f9) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/hh/bta_hh_le.cc

100755 → 100644

+0 −22

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ static void bta_hh_process_cache_rpt(tBTA_HH_DEV_CB* p_cb,
		tBTA_HH_RPT_CACHE_ENTRY* p_rpt_cache,
		uint8_t num_rpt);

		#if (BTA_HH_DEBUG == TRUE)
		static const char* bta_hh_le_rpt_name[4] = {"UNKNOWN", "INPUT", "OUTPUT",
		"FEATURE"};

		@@ -142,7 +141,6 @@ static const char* bta_hh_uuid_to_str(uint16_t uuid) {
		}
		}

		#endif
		/*******************************************************************************
		*
		* Function bta_hh_le_enable
		@@ -370,10 +368,8 @@ static tBTA_HH_LE_RPT* bta_hh_le_find_rpt_by_idtype(tBTA_HH_LE_RPT* p_head,
		tBTA_HH_LE_RPT* p_rpt = p_head;
		uint8_t i;

		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG("bta_hh_le_find_rpt_by_idtype: r_type: %d rpt_id: %d",
		r_type, rpt_id);
		#endif

		for (i = 0; i < BTA_HH_LE_RPT_MAX; i++, p_rpt++) {
		if (p_rpt->in_use && p_rpt->rpt_id == rpt_id && r_type == p_rpt->rpt_type) {
		@@ -516,9 +512,7 @@ static void bta_hh_le_save_report_ref(tBTA_HH_DEV_CB* p_dev_cb,
		if (p_rpt->rpt_type > BTA_HH_RPTT_FEATURE) /* invalid report type */
		p_rpt->rpt_type = BTA_HH_RPTT_RESRV;

		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG("%s: report ID: %d", __func__, p_rpt->rpt_id);
		#endif
		tBTA_HH_RPT_CACHE_ENTRY rpt_entry;
		rpt_entry.rpt_id = p_rpt->rpt_id;
		rpt_entry.rpt_type = p_rpt->rpt_type;
		@@ -550,10 +544,8 @@ static void bta_hh_le_register_input_notif(tBTA_HH_DEV_CB* p_dev_cb,
		bool register_ba) {
		tBTA_HH_LE_RPT* p_rpt = &p_dev_cb->hid_srvc.report[0];

		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG("%s: bta_hh_le_register_input_notif mode: %d", __func__,
		proto_mode);
		#endif

		for (int i = 0; i < BTA_HH_LE_RPT_MAX; i++, p_rpt++) {
		if (p_rpt->rpt_type == BTA_HH_RPTT_INPUT) {
		@@ -639,9 +631,7 @@ static void bta_hh_le_deregister_input_notif(tBTA_HH_DEV_CB* p_dev_cb) {
		******************************************************************************/
		static void bta_hh_le_open_cmpl(tBTA_HH_DEV_CB* p_cb) {
		if (p_cb->disc_active == BTA_HH_LE_DISC_NONE) {
		#if (BTA_HH_DEBUG == TRUE)
		bta_hh_le_hid_report_dbg(p_cb);
		#endif
		bta_hh_le_register_input_notif(p_cb, p_cb->mode, true);
		bta_hh_sm_execute(p_cb, BTA_HH_OPEN_CMPL_EVT, NULL);

		@@ -850,12 +840,10 @@ static void get_protocol_mode_cb(uint16_t conn_id, tGATT_STATUS status,
		p_dev_cb->mode = hs_data.rsp_data.proto_mode;
		}

		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG("LE GET_PROTOCOL Mode = [%s]",
		(hs_data.rsp_data.proto_mode == BTA_HH_PROTO_RPT_MODE)
		? "Report"
		: "Boot");
		#endif

		p_dev_cb->w4_evt = 0;
		(bta_hh_cb.p_cback)(BTA_HH_GET_PROTO_EVT, (tBTA_HH)&hs_data);
		@@ -908,12 +896,10 @@ static void bta_hh_le_dis_cback(const RawAddress& addr,
		p_cb->disc_active &= ~BTA_HH_LE_DISC_DIS;
		/* plug in the PnP info for this device */
		if (p_dis_value->attr_mask & DIS_ATTR_PNP_ID_BIT) {
		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG(
		"Plug in PnP info: product_id = %02x, vendor_id = %04x, version = %04x",
		p_dis_value->pnp_id.product_id, p_dis_value->pnp_id.vendor_id,
		p_dis_value->pnp_id.product_version);
		#endif
		p_cb->dscp_info.product_id = p_dis_value->pnp_id.product_id;
		p_cb->dscp_info.vendor_id = p_dis_value->pnp_id.vendor_id;
		p_cb->dscp_info.version = p_dis_value->pnp_id.product_version;
		@@ -1138,10 +1124,8 @@ void bta_hh_gatt_open(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_buf) {

		BtaGattQueue::Clean(p_cb->conn_id);

		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG("hid_handle = %2x conn_id = %04x cb_index = %d",
		p_cb->hid_handle, p_cb->conn_id, p_cb->index);
		#endif

		bta_hh_sm_execute(p_cb, BTA_HH_START_ENC_EVT, NULL);

		@@ -1274,10 +1258,8 @@ static void read_ext_rpt_ref_desc_cb(uint16_t conn_id, tGATT_STATUS status,

		STREAM_TO_UINT16(p_dev_cb->hid_srvc.ext_rpt_ref, pp);

		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG("%s: External Report Reference UUID 0x%04x", __func__,
		p_dev_cb->hid_srvc.ext_rpt_ref);
		#endif
		}

		static void read_report_ref_desc_cb(uint16_t conn_id, tGATT_STATUS status,
		@@ -1794,9 +1776,7 @@ static void write_report_cb(uint16_t conn_id, tGATT_STATUS status,

		if (cb_evt == 0) return;

		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG("bta_hh_le_write_cmpl w4_evt: %d", p_dev_cb->w4_evt);
		#endif

		const gatt::Characteristic* p_char =
		BTA_GATTC_GetCharacteristic(conn_id, handle);
		@@ -2042,9 +2022,7 @@ void bta_hh_le_remove_dev_bg_conn(tBTA_HH_DEV_CB* p_dev_cb) {
		******************************************************************************/
		static void bta_hh_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) {
		tBTA_HH_DEV_CB* p_dev_cb;
		#if (BTA_HH_DEBUG == TRUE)
		APPL_TRACE_DEBUG("bta_hh_gattc_callback event = %d", event);
		#endif
		if (p_data == NULL) return;

		switch (event) {

system/btif/test/btif_stack_test.cc

+5 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@

		#include "bta/include/bta_ag_api.h" // tBTA_AG_RES_DATA::kEmpty
		#include "hci/include/hci_layer.h" // hci_t
		#include "test/mock/mock_hci_layer.h"

		std::map<std::string, int> mock_function_count_map;

		@@ -166,7 +167,6 @@ hci_t mock_hci = {
		.transmit_command_futured = transmit_command_futured,
		.transmit_downward = transmit_downward,
		};
		const hci_t* hci_layer_get_interface() { return &mock_hci; }

		bool is_bluetooth_uid() { return false; }
		const tBTA_AG_RES_DATA tBTA_AG_RES_DATA::kEmpty = {};
		@@ -181,7 +181,10 @@ class BluetoothMetricsLogger {};

		class StackCycleTest : public ::testing::Test {
		protected:
		void SetUp() override { stack_manager_ = stack_manager_get_interface(); }
		void SetUp() override {
		test::mock::hci_layer::hci_layer_get_interface.hci = &mock_hci;
		stack_manager_ = stack_manager_get_interface();
		}

		void TearDown() override { stack_manager_ = nullptr; }
		const stack_manager_t* stack_manager_{nullptr};

system/stack/Android.bp

+58 −0

Original line number	Diff line number	Diff line
		@@ -855,3 +855,61 @@ cc_test {
		},
		},
		}

		cc_test {
		name: "net_test_stack_btu",
		test_suites: ["device-tests"],
		host_supported: true,
		defaults: ["fluoride_defaults"],
		local_include_dirs: [
		"include",
		"test/common",
		],
		include_dirs: [
		"packages/modules/Bluetooth/system",
		"packages/modules/Bluetooth/system/gd",
		],
		generated_headers: [
		"BluetoothGeneratedBundlerSchema_h_bfbs",
		"BluetoothGeneratedDumpsysDataSchema_h",
		"BluetoothGeneratedPackets_h",
		],
		srcs: [
		":TestMockBta",
		":TestMockBtif",
		":TestMockHci",
		":TestMockLegacyHciCommands",
		":TestMockMainShim",
		":TestMockStackAcl",
		":TestMockStackSmp",
		":TestStackBtm",
		":TestStackL2cap",
		":TestMockStackMetrics",
		"btu/btu_hcif.cc",
		"btu/btu_task.cc",
		"test/stack_btu_test.cc",
		],
		static_libs: [
		"libbt-common",
		"libbt-protos-lite",
		"libbtdevice",
		"libgmock",
		"liblog",
		"libosi",
		],
		shared_libs: [
		"libcrypto",
		"libprotobuf-cpp-lite",
		"libflatbuffers-cpp",
		],
		sanitize: {
		address: true,
		all_undefined: true,
		cfi: true,
		integer_overflow: true,
		scs: true,
		diag: {
		undefined : true
		},
		},
		}

system/stack/btu/btu_task.cc

+3 −2

Original line number	Diff line number	Diff line
		@@ -110,8 +110,9 @@ bt_status_t do_in_main_thread_delayed(const base::Location& from_here,
		static void do_post_on_bt_main(BtMainClosure closure) { closure(); }

		void post_on_bt_main(BtMainClosure closure) {
		ASSERT(do_in_main_thread(FROM_HERE,
		base::Bind(do_post_on_bt_main, std::move(closure))));
		ASSERT(do_in_main_thread(
		FROM_HERE, base::Bind(do_post_on_bt_main, std::move(closure))) ==
		BT_STATUS_SUCCESS);
		}

		void main_thread_start_up() {

system/stack/test/stack_btu_test.cc

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <gtest/gtest.h>
		#include <cstdint>
		#include <map>
		#include <string>

		#include "stack/include/btu.h"

		std::map<std::string, int> mock_function_count_map;

		void LogMsg(uint32_t trace_set_mask, const char* fmt_str, ...) {}

		class StackBtuTest : public ::testing::Test {};

		TEST_F(StackBtuTest, post_on_main) {}