Merge "bta_dm_disc: get rid of never used log" into main (403edb5f) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_disc.cc

+2 −47

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@
		#include "main/shim/dumpsys.h"
		#include "os/logging/log_adapter.h"
		#include "osi/include/allocator.h"
		#include "stack/btm/btm_int_types.h" // TimestampedStringCircularBuffer
		#include "stack/include/bt_name.h"
		#include "stack/include/bt_uuid16.h"
		#include "stack/include/btm_client_interface.h"
		@@ -84,8 +83,6 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data);
		static void bta_dm_execute_queued_discovery_request();
		static void bta_dm_close_gatt_conn();

		TimestampedStringCircularBuffer disc_gatt_history_{50};

		namespace {

		struct gatt_interface_t {
		@@ -106,54 +103,28 @@ struct gatt_interface_t {
		} default_gatt_interface = {
		.BTA_GATTC_CancelOpen =
		[](tGATT_IF client_if, const RawAddress& remote_bda, bool is_direct) {
		disc_gatt_history_.Push(base::StringPrintf(
		"%-32s bd_addr:%s client_if:%hu is_direct:%c", "GATTC_CancelOpen",
		ADDRESS_TO_LOGGABLE_CSTR(remote_bda), client_if,
		(is_direct) ? 'T' : 'F'));
		BTA_GATTC_CancelOpen(client_if, remote_bda, is_direct);
		},
		.BTA_GATTC_Refresh =
		[](const RawAddress& remote_bda) {
		disc_gatt_history_.Push(
		base::StringPrintf("%-32s bd_addr:%s", "GATTC_Refresh",
		ADDRESS_TO_LOGGABLE_CSTR(remote_bda)));
		BTA_GATTC_Refresh(remote_bda);
		},
		[](const RawAddress& remote_bda) { BTA_GATTC_Refresh(remote_bda); },
		.BTA_GATTC_GetGattDb =
		[](uint16_t conn_id, uint16_t start_handle, uint16_t end_handle,
		btgatt_db_element_t** db, int* count) {
		disc_gatt_history_.Push(base::StringPrintf(
		"%-32s conn_id:%hu start_handle:%hu end:handle:%hu",
		"GATTC_GetGattDb", conn_id, start_handle, end_handle));
		BTA_GATTC_GetGattDb(conn_id, start_handle, end_handle, db, count);
		},
		.BTA_GATTC_AppRegister =
		[](tBTA_GATTC_CBACK* p_client_cb, BtaAppRegisterCallback cb,
		bool eatt_support) {
		disc_gatt_history_.Push(
		base::StringPrintf("%-32s eatt_support:%c", "GATTC_AppRegister",
		(eatt_support) ? 'T' : 'F'));
		BTA_GATTC_AppRegister(p_client_cb, cb, eatt_support);
		},
		.BTA_GATTC_Close =
		[](uint16_t conn_id) {
		disc_gatt_history_.Push(
		base::StringPrintf("%-32s conn_id:%hu", "GATTC_Close", conn_id));
		BTA_GATTC_Close(conn_id);
		},
		.BTA_GATTC_Close = [](uint16_t conn_id) { BTA_GATTC_Close(conn_id); },
		.BTA_GATTC_ServiceSearchRequest =
		[](uint16_t conn_id, const bluetooth::Uuid* p_srvc_uuid) {
		disc_gatt_history_.Push(base::StringPrintf(
		"%-32s conn_id:%hu", "GATTC_ServiceSearchRequest", conn_id));
		BTA_GATTC_ServiceSearchRequest(conn_id, p_srvc_uuid);
		},
		.BTA_GATTC_Open =
		[](tGATT_IF client_if, const RawAddress& remote_bda,
		tBTM_BLE_CONN_TYPE connection_type, bool opportunistic) {
		disc_gatt_history_.Push(base::StringPrintf(
		"%-32s bd_addr:%s client_if:%hu type:0x%x opportunistic:%c",
		"GATTC_Open", ADDRESS_TO_LOGGABLE_CSTR(remote_bda), client_if,
		connection_type, (opportunistic) ? 'T' : 'F'));
		BTA_GATTC_Open(client_if, remote_bda, connection_type, opportunistic);
		},
		};
		@@ -491,9 +462,6 @@ static void bta_dm_gattc_register(void) {
		get_gatt_interface().BTA_GATTC_AppRegister(
		bta_dm_gattc_callback, base::Bind([](uint8_t client_id, uint8_t status) {
		tGATT_STATUS gatt_status = static_cast<tGATT_STATUS>(status);
		disc_gatt_history_.Push(base::StringPrintf(
		"%-32s client_id:%hu status:%s", "GATTC_RegisteredCallback",
		client_id, gatt_status_text(gatt_status).c_str()));
		if (static_cast<tGATT_STATUS>(status) == GATT_SUCCESS) {
		log::info(
		"Registered device discovery search gatt client tGATT_IF:{}",
		@@ -657,12 +625,6 @@ static void bta_dm_proc_open_evt(tBTA_GATTC_OPEN* p_data) {
		log::debug("BTA_GATTC_OPEN_EVT conn_id = {} client_if={} status = {}",
		p_data->conn_id, p_data->client_if, p_data->status);

		disc_gatt_history_.Push(base::StringPrintf(
		"%-32s bd_addr:%s conn_id:%hu client_if:%hu event:%s",
		"GATTC_EventCallback", ADDRESS_TO_LOGGABLE_CSTR(p_data->remote_bda),
		p_data->conn_id, p_data->client_if,
		gatt_client_event_text(BTA_GATTC_OPEN_EVT).c_str()));

		bta_dm_discovery_cb.conn_id = p_data->conn_id;

		if (p_data->status == GATT_SUCCESS) {
		@@ -695,10 +657,6 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) {
		bta_dm_gatt_disc_complete(p_data->search_cmpl.conn_id,
		p_data->search_cmpl.status);
		}
		disc_gatt_history_.Push(base::StringPrintf(
		"%-32s conn_id:%hu status:%s", "GATTC_EventCallback",
		p_data->search_cmpl.conn_id,
		gatt_status_text(p_data->search_cmpl.status).c_str()));
		break;

		case BTA_GATTC_CLOSE_EVT:
		@@ -731,9 +689,6 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) {
		case BTA_GATTC_SRVC_CHG_EVT:
		case BTA_GATTC_SRVC_DISC_DONE_EVT:
		case BTA_GATTC_SUBRATE_CHG_EVT:
		disc_gatt_history_.Push(
		base::StringPrintf("%-32s event:%s", "GATTC_EventCallback",
		gatt_client_event_text(event).c_str()));
		break;
		}
		}