diff options
| author | Okeer <okeer.md@gmail.com> | 2017-04-15 22:38:10 +0700 |
|---|---|---|
| committer | Okeer <okeer.md@gmail.com> | 2017-04-15 22:38:10 +0700 |
| commit | d17396c201e58e20a883d80303fae100b90a98c1 (patch) | |
| tree | b0fbb7a1b722d2cae3acd97996d263969b74203b | |
| parent | c0e5c0bc6667b80a95805c30d65601a309c2f2f6 (diff) | |
| download | android_system_bt-d17396c201e58e20a883d80303fae100b90a98c1.tar.gz android_system_bt-d17396c201e58e20a883d80303fae100b90a98c1.tar.bz2 android_system_bt-d17396c201e58e20a883d80303fae100b90a98c1.zip | |
bt: fix build for non-BLE after the 7.1.2 merge
Add BLE guards to btm_use_preferred_conn_params() and partially to
btif_dm_create_bond_out_of_band().
Change-Id: I43d45ce58c98e7f2d4dd73bd4db7518372f07afd
| -rw-r--r-- | btif/src/btif_dm.c | 2 | ||||
| -rw-r--r-- | stack/btm/btm_acl.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index f6880dd58..73c930516 100644 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -2657,6 +2657,7 @@ bt_status_t btif_dm_create_bond_out_of_band(const bt_bdaddr_t *bd_addr, int tran bdcpy(oob_cb.bdaddr, bd_addr->address); memcpy(&oob_cb.oob_data, oob_data, sizeof(bt_out_of_band_data_t)); + #if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE)) uint8_t empty[] = {0, 0, 0, 0, 0, 0, 0}; // If LE Bluetooth Device Address is provided, use provided address type // value. @@ -2669,6 +2670,7 @@ bt_status_t btif_dm_create_bond_out_of_band(const bt_bdaddr_t *bd_addr, int tran BTM_SecAddBleDevice(bd_addr->address, NULL, BT_DEVICE_TYPE_BLE, address_type); } } + #endif bdstr_t bdstr; BTIF_TRACE_EVENT("%s: bd_addr=%s, transport=%d", __FUNCTION__, bdaddr_to_string(bd_addr, bdstr, sizeof(bdstr)), transport); diff --git a/stack/btm/btm_acl.c b/stack/btm/btm_acl.c index f863b210b..5eda7f643 100644 --- a/stack/btm/btm_acl.c +++ b/stack/btm/btm_acl.c @@ -1005,7 +1005,7 @@ void BTM_SetDefaultLinkPolicy (UINT16 settings) btsnd_hcic_write_def_policy_set(settings); } - +#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE)) void btm_use_preferred_conn_params(BD_ADDR bda) { tL2C_LCB *p_lcb = l2cu_find_lcb_by_bd_addr (bda, BT_TRANSPORT_LE); tBTM_SEC_DEV_REC *p_dev_rec = btm_find_or_alloc_dev (bda); @@ -1041,6 +1041,8 @@ void btm_use_preferred_conn_params(BD_ADDR bda) { 0, 0); } } +#endif + /******************************************************************************* ** |