Snap for 7045433 from 195af48963772939bcac1d3b54522433c0d4d1e4 to sc-release (79bfed6b) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_cmd.cc

+8 −6

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ enum {
		};

		/* AT command interpreter table for HSP */
		const tBTA_AG_AT_CMD bta_ag_hsp_cmd[] = {
		static const tBTA_AG_AT_CMD bta_ag_hsp_cmd[] = {
		{"+CKPD", BTA_AG_AT_CKPD_EVT, BTA_AG_AT_SET, BTA_AG_AT_INT, 200, 200},
		{"+VGS", BTA_AG_SPK_EVT, BTA_AG_AT_SET, BTA_AG_AT_INT, 0, 15},
		{"+VGM", BTA_AG_MIC_EVT, BTA_AG_AT_SET, BTA_AG_AT_INT, 0, 15},
		@@ -70,7 +70,7 @@ const tBTA_AG_AT_CMD bta_ag_hsp_cmd[] = {
		{"", 0, 0, 0, 0, 0}};

		/* AT command interpreter table for HFP */
		const tBTA_AG_AT_CMD bta_ag_hfp_cmd[] = {
		static const tBTA_AG_AT_CMD bta_ag_hfp_cmd[] = {
		{"A", BTA_AG_AT_A_EVT, BTA_AG_AT_NONE, BTA_AG_AT_STR, 0, 0},
		{"D", BTA_AG_AT_D_EVT, BTA_AG_AT_NONE \| BTA_AG_AT_FREE, BTA_AG_AT_STR, 0,
		0},
		@@ -138,7 +138,7 @@ enum {
		};

		/* AT result code constant table */
		const tBTA_AG_RESULT bta_ag_result_tbl[] = {
		static const tBTA_AG_RESULT bta_ag_result_tbl[] = {
		{"OK", BTA_AG_LOCAL_RES_OK, BTA_AG_RES_FMT_NONE},
		{"ERROR", BTA_AG_LOCAL_RES_ERROR, BTA_AG_RES_FMT_NONE},
		{"RING", BTA_AG_LOCAL_RES_RING, BTA_AG_RES_FMT_NONE},
		@@ -179,7 +179,7 @@ typedef struct {
		} tBTA_AG_INDICATOR_MAP;

		/* callsetup indicator value lookup table */
		const tBTA_AG_INDICATOR_MAP callsetup_indicator_map[] = {
		static const tBTA_AG_INDICATOR_MAP callsetup_indicator_map[] = {
		{BTA_AG_IN_CALL_RES, BTA_AG_CALLSETUP_INCOMING},
		{BTA_AG_CALL_WAIT_RES, BTA_AG_CALLSETUP_INCOMING},
		{BTA_AG_OUT_CALL_ORIG_RES, BTA_AG_CALLSETUP_OUTGOING},
		@@ -1346,7 +1346,8 @@ void bta_ag_at_err_cback(tBTA_AG_SCB* p_scb, bool unknown, const char* p_arg) {
		* Returns void
		*
		******************************************************************************/
		void bta_ag_hsp_result(tBTA_AG_SCB* p_scb, const tBTA_AG_API_RESULT& result) {
		static void bta_ag_hsp_result(tBTA_AG_SCB* p_scb,
		const tBTA_AG_API_RESULT& result) {
		APPL_TRACE_DEBUG("bta_ag_hsp_result : res = %d", result.result);

		switch (result.result) {
		@@ -1441,7 +1442,8 @@ void bta_ag_hsp_result(tBTA_AG_SCB* p_scb, const tBTA_AG_API_RESULT& result) {
		* Returns void
		*
		******************************************************************************/
		void bta_ag_hfp_result(tBTA_AG_SCB* p_scb, const tBTA_AG_API_RESULT& result) {
		static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb,
		const tBTA_AG_API_RESULT& result) {
		APPL_TRACE_DEBUG("bta_ag_hfp_result : res = %d", result.result);

		switch (result.result) {

system/bta/ag/bta_ag_int.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@
		#ifndef BTA_AG_INT_H
		#define BTA_AG_INT_H

		#include <cstdint>

		#include "bta_ag_api.h"
		#include "bta_ag_at.h"
		#include "bta_api.h"
		@@ -96,7 +98,7 @@ enum {
		};

		/* sco states */
		enum {
		typedef enum : uint8_t {
		BTA_AG_SCO_SHUTDOWN_ST, /* no sco listening, all sco connections closed */
		BTA_AG_SCO_LISTEN_ST, /* sco listening */
		BTA_AG_SCO_CODEC_ST, /* sco codec negotiation */
		@@ -108,7 +110,7 @@ enum {
		BTA_AG_SCO_CLOSE_OP_ST, /* closing sco being opened */
		BTA_AG_SCO_CLOSE_XFER_ST, /* closing sco being transferred */
		BTA_AG_SCO_SHUTTING_ST /* sco shutting down */
		};
		} tBTA_AG_SCO;

		/*****************************************************************************
		* Data types
		@@ -252,7 +254,7 @@ typedef struct {
		tBTA_AG_SCB* p_curr_scb; /* SCB associated with SCO connection */
		tBTA_AG_SCB* p_xfer_scb; /* SCB associated with SCO transfer */
		uint16_t cur_idx; /* SCO handle */
		uint8_t state; /* SCO state variable */
		tBTA_AG_SCO state; /* SCO state variable */
		bool is_local; /* SCO connection initiated locally or remotely */
		} tBTA_AG_SCO_CB;

system/bta/dm/bta_dm_int.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -26,8 +26,10 @@

		#include <base/strings/stringprintf.h>
		#include <memory>
		#include <string>
		#include "bt_target.h"
		#include "bta/sys/bta_sys.h"
		#include "main/shim/dumpsys.h"

		#include "bta/include/bta_gatt_api.h"

		@@ -224,6 +226,13 @@ typedef struct {
		tBTA_SYS_CONN_STATUS state;
		bool new_request;

		std::string ToString() const {
		return base::StringPrintf(
		"peer:%s sys_name:%s app_id:%hhu state:%s new:request:%s",
		PRIVATE_ADDRESS(peer_bdaddr), BtaIdSysText(id).c_str(), app_id,
		bta_sys_conn_status_text(state).c_str(), logbool(new_request).c_str());
		}

		} tBTA_DM_SRVCS;

		#ifndef BTA_DM_NUM_CONN_SRVS

system/gd/l2cap/classic/cert/cert_l2cap.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -357,7 +357,7 @@ class CertL2cap(Closable, IHasBehaviors):
		if information_type == l2cap_packets.InformationRequestInfoType.EXTENDED_FEATURES_SUPPORTED:
		response = l2cap_packets.InformationResponseExtendedFeaturesBuilder(
		sid, l2cap_packets.InformationRequestResult.SUCCESS, 0, 0, 0, self.support_ertm, 0, self.support_fcs, 0,
		0, 0, 0)
		0, 0, 0, 0)
		self.control_channel.send(response)
		return
		if information_type == l2cap_packets.InformationRequestInfoType.FIXED_CHANNELS_SUPPORTED:

system/gd/l2cap/classic/internal/signalling_manager.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -662,7 +662,7 @@ void ClassicSignallingManager::OnInformationRequest(SignalId signal_id, Informat
		case InformationRequestInfoType::EXTENDED_FEATURES_SUPPORTED: {
		auto response = InformationResponseExtendedFeaturesBuilder::Create(
		signal_id.Value(), InformationRequestResult::SUCCESS, 0, 0, 0, 1 /* ERTM /, 0 / Streaming mode */,
		1 /* FCS /, 0, 1 / Fixed Channels */, 0, 0);
		1 /* FCS /, 0, 1 / Fixed Channels /, 0, 0, 0 / COC */);
		enqueue_buffer_->Enqueue(std::move(response), handler_);
		break;
		}