Merge changes I60617a14,Ide896075 into main (ee771ae1) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -499,6 +499,7 @@ cc_test {
		"BluetoothGeneratedDumpsysTestData_h",
		],
		static_libs: [
		"libbase",
		"libbluetooth-gdx",
		"libbluetooth-types",
		"libbluetooth_gd",
		@@ -512,6 +513,7 @@ cc_test {
		"libevent",
		"libflatbuffers-cpp",
		"libgmock",
		"liblog",
		"libosi",
		],
		shared_libs: [

system/stack/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -1454,6 +1454,7 @@ cc_test {
		"libcutils",
		],
		static_libs: [
		"libbase",
		"libbluetooth-types",
		"libbluetooth_gd",
		"libbluetooth_log",
		@@ -1770,6 +1771,7 @@ cc_test {
		"test/stack_btu_test.cc",
		],
		static_libs: [
		"libbase",
		"libbluetooth-types",
		"libbluetooth_gd",
		"libbluetooth_log",

system/stack/btu/btu_hcif.cc

+38 −39

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

		#include <base/functional/bind.h>
		#include <base/location.h>
		#include <bluetooth/log.h>

		#include <cstdint>

		@@ -63,6 +64,7 @@
		#include "types/hci_role.h"
		#include "types/raw_address.h"

		using namespace bluetooth;
		using base::Location;
		using bluetooth::hci::IsoManager;

		@@ -199,8 +201,8 @@ static void btu_hcif_log_event_metrics(uint8_t evt_code,
		case HCI_CONNECTION_REQUEST_EVT: // EventCode::CONNECTION_REQUEST
		case HCI_DISCONNECTION_COMP_EVT: // EventCode::DISCONNECTION_COMPLETE
		default:
		LOG_ERROR(
		"Unexpectedly received event_code:0x%02x that should not be "
		log::error(
		"Unexpectedly received event_code:0x{:02x} that should not be "
		"handled here",
		evt_code);
		break;
		@@ -227,8 +229,8 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id,

		// validate event size
		if (hci_evt_len < hci_event_parameters_minimum_length[hci_evt_code]) {
		LOG_WARN("%s: evt:0x%2X, malformed event of size %hhd", __func__,
		hci_evt_code, hci_evt_len);
		log::warn("evt:0x{:2X}, malformed event of size {}", hci_evt_code,
		hci_evt_len);
		return;
		}

		@@ -263,16 +265,14 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id,
		btu_hcif_read_rmt_ext_features_comp_evt(p, hci_evt_len);
		break;
		case HCI_COMMAND_COMPLETE_EVT:
		LOG_ERROR(
		"%s should not have received a command complete event. "
		"Someone didn't go through the hci transmit_command function.",
		__func__);
		log::error(
		"should not have received a command complete event. Someone didn't "
		"go through the hci transmit_command function.");
		break;
		case HCI_COMMAND_STATUS_EVT:
		LOG_ERROR(
		"%s should not have received a command status event. "
		"Someone didn't go through the hci transmit_command function.",
		__func__);
		log::error(
		"should not have received a command status event. Someone didn't go "
		"through the hci transmit_command function.");
		break;
		case HCI_MODE_CHANGE_EVT:
		btu_hcif_mode_change_evt(p);
		@@ -382,9 +382,9 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id,
		case HCI_BLE_ENHANCED_CONN_COMPLETE_EVT: // SubeventCode::ENHANCED_CONNECTION_COMPLETE
		case HCI_LE_SUBRATE_CHANGE_EVT: // SubeventCode::LE_SUBRATE_CHANGE
		default:
		LOG_ERROR(
		"Unexpectedly received LE sub_event_code:0x%02x that should not "
		"be handled here",
		log::error(
		"Unexpectedly received LE sub_event_code:0x{:02x} that should "
		"not be handled here",
		ble_sub_code);
		break;
		}
		@@ -404,8 +404,8 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id,
		case HCI_ROLE_CHANGE_EVT: // EventCode::ROLE_CHANGE
		case HCI_DISCONNECTION_COMP_EVT: // EventCode::DISCONNECTION_COMPLETE
		default:
		LOG_ERROR(
		"Unexpectedly received event_code:0x%02x that should not be "
		log::error(
		"Unexpectedly received event_code:0x{:02x} that should not be "
		"handled here",
		hci_evt_code);
		break;
		@@ -731,8 +731,7 @@ static void btu_hcif_command_complete_evt_with_cb_on_task(BT_HDR* event,
		btu_hcif_log_command_complete_metrics(opcode, stream);

		cmd_with_cb_data* cb_wrapper = (cmd_with_cb_data*)context;
		LOG_VERBOSE("command complete for: %s",
		cb_wrapper->posted_from.ToString().c_str());
		log::verbose("command complete for: {}", cb_wrapper->posted_from.ToString());
		// 2 for event header: event code (1) + parameter length (1)
		// 3 for command complete header: num_hci_pkt (1) + opcode (2)
		uint16_t param_len = static_cast<uint16_t>(event->len - 5);
		@@ -765,8 +764,7 @@ static void btu_hcif_command_status_evt_with_cb_on_task(uint8_t status,

		// report command status error
		cmd_with_cb_data* cb_wrapper = (cmd_with_cb_data*)context;
		LOG_VERBOSE("command status for: %s",
		cb_wrapper->posted_from.ToString().c_str());
		log::verbose("command status for: {}", cb_wrapper->posted_from.ToString());
		std::move(cb_wrapper->cb).Run(&status, sizeof(uint16_t));
		cmd_with_cb_data_cleanup(cb_wrapper);
		osi_free(cb_wrapper);
		@@ -1067,7 +1065,7 @@ static void btu_hcif_hdl_command_complete(uint16_t opcode, uint8_t* p,
		case HCI_BLE_CREATE_LL_CONN:
		case HCI_LE_EXTENDED_CREATE_CONNECTION:
		// No command complete event for those commands according to spec
		LOG_ERROR("No command complete expected, but received!");
		log::error("No command complete expected, but received!");
		break;

		case HCI_BLE_TRANSMITTER_TEST:
		@@ -1112,7 +1110,8 @@ static void btu_hcif_hdl_command_complete(uint16_t opcode, uint8_t* p,
		break;

		default:
		LOG_ERROR("Command complete for opcode:0x%02x should not be handled here",
		log::error(
		"Command complete for opcode:0x{:02x} should not be handled here",
		opcode);
		break;
		}
		@@ -1247,16 +1246,16 @@ static void btu_hcif_hdl_command_status(uint16_t opcode, uint8_t status,
		case HCI_READ_RMT_CLOCK_OFFSET: // 0x041f
		case HCI_CHANGE_CONN_PACKET_TYPE: // 0x040f
		if (hci_status != HCI_SUCCESS) {
		LOG_WARN("Received bad command status for opcode:0x%02x status:%s",
		opcode, hci_status_code_text(hci_status).c_str());
		log::warn("Received bad command status for opcode:0x{:02x} status:{}",
		opcode, hci_status_code_text(hci_status));
		}
		break;

		default:
		LOG_ERROR(
		"Command status for opcode:0x%02x should not be handled here "
		"status:%s",
		opcode, hci_status_code_text(hci_status).c_str());
		log::error(
		"Command status for opcode:0x{:02x} should not be handled here "
		"status:{}",
		opcode, hci_status_code_text(hci_status));
		}
		}

		@@ -1371,7 +1370,7 @@ void btu_hcif_proc_sp_req_evt(tBTM_SP_EVT event, const uint8_t* p) {
		// No value needed.
		break;
		default:
		LOG_WARN("unexpected event:%s", sp_evt_to_text(event).c_str());
		log::warn("unexpected event:{}", sp_evt_to_text(event));
		break;
		}
		btm_proc_sp_req_evt(event, bda, value);
		@@ -1380,7 +1379,7 @@ void btu_hcif_create_conn_cancel_complete(const uint8_t* p, uint16_t evt_len) {
		uint8_t status;

		if (evt_len < 1 + BD_ADDR_LEN) {
		LOG_ERROR("malformatted event packet, too short");
		log::error("malformatted event packet, too short");
		return;
		}

		@@ -1410,7 +1409,7 @@ void btu_hcif_read_local_oob_complete(const uint8_t* p, uint16_t evt_len) {
		return;

		err_out:
		LOG_ERROR("bogus event packet, too short");
		log::error("bogus event packet, too short");
		}

		/*******************************************************************************
		@@ -1533,7 +1532,7 @@ static void btu_ble_ll_conn_param_upd_evt(uint8_t* p, uint16_t evt_len) {
		uint16_t timeout;

		if (evt_len < 9) {
		LOG_ERROR("Malformated event packet, too short");
		log::error("Malformated event packet, too short");
		return;
		}

		@@ -1559,7 +1558,7 @@ static void btu_ble_proc_ltk_req(uint8_t* p, uint16_t evt_len) {
		// - 8-byte random number
		// - 2 byte Encrypted_Diversifier
		if (evt_len < 2 + 8 + 2) {
		LOG_ERROR("Event packet too short");
		log::error("Event packet too short");
		return;
		}

		@@ -1576,13 +1575,13 @@ static void btu_ble_data_length_change_evt(uint8_t* p, uint16_t evt_len) {
		uint16_t rx_data_len;

		if (!controller_get_interface()->SupportsBleDataPacketLengthExtension()) {
		LOG_WARN("request not supported");
		log::warn("request not supported");
		return;
		}

		// 2 bytes each for handle, tx_data_len, TxTimer, rx_data_len
		if (evt_len < 8) {
		LOG_ERROR("Event packet too short");
		log::error("Event packet too short");
		return;
		}

		@@ -1602,7 +1601,7 @@ static void btu_ble_rc_param_req_evt(uint8_t* p, uint8_t len) {
		uint16_t int_min, int_max, latency, timeout;

		if (len < 10) {
		LOG_ERROR("bogus event packet, too short");
		log::error("bogus event packet, too short");
		return;
		}

system/stack/btu/main_thread.cc

+7 −5

Original line number	Diff line number	Diff line
		@@ -24,12 +24,14 @@
		#include <base/logging.h>
		#include <base/run_loop.h>
		#include <base/threading/thread.h>
		#include <bluetooth/log.h>

		#include "common/message_loop_thread.h"
		#include "include/hardware/bluetooth.h"
		#include "os/log.h"

		using bluetooth::common::MessageLoopThread;
		using namespace bluetooth;

		static MessageLoopThread main_thread("bt_main_thread");

		@@ -38,7 +40,7 @@ bluetooth::common::MessageLoopThread* get_main_thread() { return &main_thread; }
		bt_status_t do_in_main_thread(const base::Location& from_here,
		base::OnceClosure task) {
		if (!main_thread.DoInThread(from_here, std::move(task))) {
		LOG(ERROR) << __func__ << ": failed from " << from_here.ToString();
		log::error("failed from {}", from_here.ToString());
		return BT_STATUS_FAIL;
		}
		return BT_STATUS_SUCCESS;
		@@ -48,7 +50,7 @@ bt_status_t do_in_main_thread_delayed(const base::Location& from_here,
		base::OnceClosure task,
		std::chrono::microseconds delay) {
		if (!main_thread.DoInThreadDelayed(from_here, std::move(task), delay)) {
		LOG(ERROR) << __func__ << ": failed from " << from_here.ToString();
		log::error("failed from {}", from_here.ToString());
		return BT_STATUS_FAIL;
		}
		return BT_STATUS_SUCCESS;
		@@ -65,13 +67,13 @@ void post_on_bt_main(BtMainClosure closure) {
		void main_thread_start_up() {
		main_thread.StartUp();
		if (!main_thread.IsRunning()) {
		LOG(FATAL) << __func__ << ": unable to start btu message loop thread.";
		log::fatal("unable to start btu message loop thread.");
		}
		if (!main_thread.EnableRealTimeScheduling()) {
		#if defined(__ANDROID__)
		LOG(FATAL) << __func__ << ": unable to enable real time scheduling";
		log::fatal("unable to enable real time scheduling");
		#else
		LOG(ERROR) << __func__ << ": unable to enable real time scheduling";
		log::error("unable to enable real time scheduling");
		#endif
		}
		}

system/stack/eatt/eatt.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@
		* limitations under the License.
		*/

		#include <base/logging.h>
		#include <bluetooth/log.h>

		#include "eatt_impl.h"
		#include "stack/include/bt_hdr.h"
		@@ -33,7 +33,7 @@ struct EattExtension::impl {

		void Start() {
		if (eatt_impl_) {
		LOG(ERROR) << "Eatt already started";
		log::error("Eatt already started");
		return;
		};

		@@ -48,7 +48,7 @@ struct EattExtension::impl {
		reg_info_.pL2CA_CreditBasedCollisionInd_Cb = eatt_collision_ind;

		if (L2CA_RegisterLECoc(BT_PSM_EATT, reg_info_, BTM_SEC_NONE, {}) == 0) {
		LOG(ERROR) << __func__ << " cannot register EATT";
		log::error("cannot register EATT");
		} else {
		eatt_impl_ = std::make_unique<eatt_impl>();
		}
		@@ -56,7 +56,7 @@ struct EattExtension::impl {

		void Stop() {
		if (!eatt_impl_) {
		LOG(ERROR) << "Eatt not started";
		log::error("Eatt not started");
		return;
		}
		eatt_impl_.reset(nullptr);