Merge "Solve compilation problem when BLE/GATT/SMP features are false" into jb-mr2-dev (f9d22c3c) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_int.h

+6 −7

Original line number	Diff line number	Diff line
		@@ -510,13 +510,6 @@ typedef struct
		tBTA_DM_SEARCH_CBACK * p_cback;
		}tBTA_DM_API_BLE_OBSERVE;

		typedef struct
		{
		BT_HDR hdr;
		BOOLEAN enable_or_disable;
		}tBTA_DM_API_SET_AFH_CHANNEL_ASSESSMENT;


		/* set adv parameter for BLE advertising */
		typedef struct
		{
		@@ -535,6 +528,12 @@ typedef struct

		#endif

		typedef struct
		{
		BT_HDR hdr;
		BOOLEAN enable_or_disable;
		}tBTA_DM_API_SET_AFH_CHANNEL_ASSESSMENT;

		#if ( BTM_EIR_SERVER_INCLUDED == TRUE )&&( BTA_EIR_CANNED_UUID_LIST != TRUE )&&(BTA_EIR_SERVER_NUM_CUSTOM_UUID > 0)
		/* data type for BTA_DM_API_UPDATE_EIR_UUID_EVT */
		typedef struct

+3 −0

Original line number	Diff line number	Diff line
		@@ -1862,6 +1862,8 @@ BTA_API extern void BTA_DmBleObserve(BOOLEAN start, UINT8 duration,
		**
		*******************************************************************************/
		BTA_API extern void BTA_DmSetAfhChannelAssessment (BOOLEAN enable_or_disable);

		#if BLE_INCLUDE == TRUE
		// btla-specific --
		/*******************************************************************************
		**
		@@ -1904,6 +1906,7 @@ BTA_API extern void BTA_DmBleEnableRemotePrivacy(BD_ADDR bd_addr, BOOLEAN privac
		*******************************************************************************/
		BTA_API extern void BTA_DmBleSetAdvConfig (tBTA_BLE_AD_MASK data_mask,
		tBTA_BLE_ADV_DATA *p_adv_cfg);
		#endif

		#ifdef __cplusplus
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,9 +27,9 @@
		#endif
		#if (defined BLE_INCLUDED && BLE_INCLUDED == TRUE)
		#include "bte_appl.h"
		#endif

		tBTE_APPL_CFG bte_appl_cfg = { 0x5, 0x4, 0x7, 0x7, 0x10 };
		#endif

		/*******************************************************************************
		**

+9 −1

Original line number	Diff line number	Diff line
		@@ -326,8 +326,10 @@ static const void* get_profile_interface (const char *profile_id)
		if (is_profile(profile_id, BT_PROFILE_HEALTH_ID))
		return btif_hl_get_interface();

		#if BTA_GATT_INCLUDED == TRUE
		if (is_profile(profile_id, BT_PROFILE_GATT_ID))
		return btif_gatt_get_interface();
		#endif

		if (is_profile(profile_id, BT_PROFILE_AV_RC_ID))
		return btif_rc_get_interface();
		@@ -356,6 +358,8 @@ int dut_mode_send(uint16_t opcode, uint8_t* buf, uint8_t len)

		return btif_dut_mode_send(opcode, buf, len);
		}

		#if BLE_INCLUDED == TRUE
		int le_test_mode(uint16_t opcode, uint8_t* buf, uint8_t len)
		{
		ALOGI("le_test_mode");
		@@ -366,7 +370,7 @@ int le_test_mode(uint16_t opcode, uint8_t* buf, uint8_t len)

		return btif_le_test_mode(opcode, buf, len);
		}

		#endif

		static const bt_interface_t bluetoothInterface = {
		sizeof(bluetoothInterface),
		@@ -392,7 +396,11 @@ static const bt_interface_t bluetoothInterface = {
		get_profile_interface,
		dut_mode_configure,
		dut_mode_send,
		#if BLE_INCLUDED == TRUE
		le_test_mode
		#else
		NULL
		#endif
		};

		const bt_interface_t* bluetooth__get_bluetooth_interface ()

+2 −0

Original line number	Diff line number	Diff line
		@@ -479,6 +479,7 @@ static void btif_dm_cb_create_bond(bt_bdaddr_t *bd_addr)
		}
		else
		{
		#if BLE_INCLUDED == TRUE
		int device_type;
		int addr_type;
		bdstr_t bdstr;
		@@ -489,6 +490,7 @@ static void btif_dm_cb_create_bond(bt_bdaddr_t *bd_addr)
		{
		BTA_DmAddBleDevice(bd_addr->address, addr_type, BT_DEVICE_TYPE_BLE);
		}
		#endif
		BTA_DmBond ((UINT8 *)bd_addr->address);
		}
		/* Track originator of bond creation */