Snap for 7283897 from 1d20cc1a78c96dc4f641d87e110dbecf26592b5f to sc-release (babc9838) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -1214,7 +1214,7 @@ void bta_dm_sdp_result(tBTA_DM_MSG* p_data) {
		// Piggy back the SCN over result field
		if (scn_found) {
		p_msg->disc_result.result.disc_res.result =
		(3 + bta_dm_search_cb.peer_scn);
		static_cast<tBTA_STATUS>((3 + bta_dm_search_cb.peer_scn));
		p_msg->disc_result.result.disc_res.services \|= BTA_USER_SERVICE_MASK;

		APPL_TRACE_EVENT(" Piggy back the SCN over result field SCN=%d",

+8 −8

Original line number	Diff line number	Diff line
		@@ -46,14 +46,14 @@
		****************************************************************************/

		/* Status Return Value */
		#define BTA_SUCCESS 0 /* Successful operation. */
		#define BTA_FAILURE 1 /* Generic failure. */
		#define BTA_PENDING 2 /* API cannot be completed right now */
		#define BTA_BUSY 3
		#define BTA_NO_RESOURCES 4
		#define BTA_WRONG_MODE 5

		typedef uint8_t tBTA_STATUS;
		typedef enum : uint8_t {
		BTA_SUCCESS = 0, /* Successful operation. */
		BTA_FAILURE = 1, /* Generic failure. */
		BTA_PENDING = 2, /* API cannot be completed right now */
		BTA_BUSY = 3,
		BTA_NO_RESOURCES = 4,
		BTA_WRONG_MODE = 5,
		} tBTA_STATUS;

		/*
		* Service ID

+6 −6

Original line number	Diff line number	Diff line
		@@ -29,12 +29,12 @@ typedef future_t* (*module_lifecycle_fn)(void);
		#define BTCORE_MAX_MODULE_DEPENDENCIES 10

		typedef struct {
		const char* name;
		module_lifecycle_fn init;
		module_lifecycle_fn start_up;
		module_lifecycle_fn shut_down;
		module_lifecycle_fn clean_up;
		const char* dependencies[BTCORE_MAX_MODULE_DEPENDENCIES];
		const char* name{nullptr};
		module_lifecycle_fn init{nullptr};
		module_lifecycle_fn start_up{nullptr};
		module_lifecycle_fn shut_down{nullptr};
		module_lifecycle_fn clean_up{nullptr};
		const char* dependencies[BTCORE_MAX_MODULE_DEPENDENCIES]{nullptr};
		} module_t;

		// Prepares module management. Must be called before doing anything with

+4 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,10 @@ class HciHalHidl : public HciHal {
		bt_hci_1_1_ = nullptr;
		}

		std::string ToString() const override {
		return std::string("HciHalHidl");
		}

		private:
		android::sp<InternalHciCallbacks> callbacks_;
		android::sp<IBluetoothHci_1_0> bt_hci_;

+4 −0

Original line number	Diff line number	Diff line
		@@ -341,6 +341,10 @@ class HciHalHost : public HciHal {
		LOG_INFO("HAL is closed");
		}

		std::string ToString() const override {
		return std::string("HciHalHost");
		}

		private:
		// Held when APIs are called, NOT to be held during callbacks
		std::mutex api_mutex_;