Merge "Fix reorder-init-list warning" into main (8a1bac70) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/av/bta_av_act.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -2216,9 +2216,9 @@ void bta_av_rc_disc_done_all(UNUSED_ATTR tBTA_AV_DATA* p_data) {
		tBTA_AV bta_av_data = {
		.rc_open =
		{
		.peer_addr = p_scb->PeerAddress(),
		.peer_ct_features = peer_ct_features,
		.peer_tg_features = peer_tg_features,
		.peer_addr = p_scb->PeerAddress(),
		.status = BTA_AV_FAIL_SDP,
		},
		};
		@@ -2246,9 +2246,9 @@ void bta_av_rc_disc_done_all(UNUSED_ATTR tBTA_AV_DATA* p_data) {
		}

		tBTA_AV bta_av_feat = {.rc_feat = {
		.rc_handle = rc_handle,
		.peer_ct_features = peer_ct_features,
		.peer_tg_features = peer_tg_features,
		.rc_handle = rc_handle,
		.peer_addr = peer_addr,
		}};
		(*p_cb->p_cback)(BTA_AV_RC_FEAT_EVT, &bta_av_feat);

+3 −3

Original line number	Diff line number	Diff line
		@@ -497,8 +497,8 @@ class CsisClientTest : public ::testing::Test {
		const RawAddress& address, uint16_t conn_id,
		tGATT_DISCONN_REASON reason = GATT_CONN_TERMINATE_PEER_USER) {
		tBTA_GATTC_CLOSE event_data = {
		.status = GATT_SUCCESS,
		.conn_id = conn_id,
		.status = GATT_SUCCESS,
		.client_if = gatt_if,
		.remote_bda = address,
		.reason = reason,
		@@ -509,8 +509,8 @@ class CsisClientTest : public ::testing::Test {

		void GetSearchCompleteEvent(uint16_t conn_id) {
		tBTA_GATTC_SEARCH_CMPL event_data = {
		.status = GATT_SUCCESS,
		.conn_id = conn_id,
		.status = GATT_SUCCESS,
		};

		gatt_callback(BTA_GATTC_SEARCH_CMPL_EVT, (tBTA_GATTC*)&event_data);
		@@ -536,8 +536,8 @@ class CsisClientTest : public ::testing::Test {

		void GetDisconnectedEvent(const RawAddress& address, uint16_t conn_id) {
		tBTA_GATTC_CLOSE event_data = {
		.status = GATT_SUCCESS,
		.conn_id = conn_id,
		.status = GATT_SUCCESS,
		.client_if = gatt_if,
		.remote_bda = address,
		.reason = GATT_CONN_TERMINATE_PEER_USER,

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,12 +152,12 @@ void BTA_GATTC_Open(tGATT_IF client_if, const RawAddress& remote_bda,
		.event = BTA_GATTC_API_OPEN_EVT,
		},
		.remote_bda = remote_bda,
		.remote_addr_type = addr_type,
		.client_if = client_if,
		.connection_type = connection_type,
		.transport = transport,
		.initiating_phys = initiating_phys,
		.opportunistic = opportunistic,
		.remote_addr_type = addr_type,
		},
		};

+2 −3

Original line number	Diff line number	Diff line
		@@ -247,9 +247,8 @@ static void bta_gattc_explore_next_service(uint16_t conn_id,
		BTA_GATTC_DISCOVER_REQ_READ_EXT_PROP_DESC;

		if (p_srvc_cb->read_multiple_not_supported \|\| descriptors.size() == 1) {
		tGATT_READ_PARAM read_param{
		.by_handle = {.handle = descriptors.front(),
		.auth_req = GATT_AUTH_REQ_NONE}};
		tGATT_READ_PARAM read_param{.by_handle = {.auth_req = GATT_AUTH_REQ_NONE,
		.handle = descriptors.front()}};
		GATTC_Read(conn_id, GATT_READ_BY_HANDLE, &read_param);
		// asynchronous continuation in bta_gattc_op_cmpl_during_discovery
		return;

+2 −2

Original line number	Diff line number	Diff line
		@@ -841,8 +841,8 @@ class HasClientTestBase : public ::testing::Test {
		if (!allow_fake_conn) ASSERT_NE(connected_devices.count(conn_id), 0u);

		tBTA_GATTC_CLOSE event_data = {
		.status = GATT_SUCCESS,
		.conn_id = conn_id,
		.status = GATT_SUCCESS,
		.client_if = gatt_if,
		.remote_bda = connected_devices[conn_id],
		.reason = reason,
		@@ -854,8 +854,8 @@ class HasClientTestBase : public ::testing::Test {

		void InjectSearchCompleteEvent(uint16_t conn_id) {
		tBTA_GATTC_SEARCH_CMPL event_data = {
		.status = GATT_SUCCESS,
		.conn_id = conn_id,
		.status = GATT_SUCCESS,
		};

		gatt_callback(BTA_GATTC_SEARCH_CMPL_EVT, (tBTA_GATTC*)&event_data);