diff options
| author | Satya Calloji <satyac@broadcom.com> | 2015-03-06 10:38:22 -0800 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-04-13 00:09:06 -0700 |
| commit | 444a8da807abaf5f9e813ce70c56a79160495fb3 (patch) | |
| tree | 20a35a257203d1a87f34d887ffba13672af4288a /stack/gatt/gatt_main.c | |
| parent | 8372aa5fa535ee4f09c09981b6125b54ace31fe2 (diff) | |
| download | android_system_bt-444a8da807abaf5f9e813ce70c56a79160495fb3.tar.gz android_system_bt-444a8da807abaf5f9e813ce70c56a79160495fb3.tar.bz2 android_system_bt-444a8da807abaf5f9e813ce70c56a79160495fb3.zip | |
LE Privacy 1.2 and LE secure connections
Bug: 19816438
Original author: Chaojing Sun <cjsun@broadcom.com>
Change-Id: I5951f4d4e038f8348a62aa6d19b2111bae0b3ecc
Diffstat (limited to 'stack/gatt/gatt_main.c')
| -rw-r--r-- | stack/gatt/gatt_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/stack/gatt/gatt_main.c b/stack/gatt/gatt_main.c index e1e9564f9..d7811364d 100644 --- a/stack/gatt/gatt_main.c +++ b/stack/gatt/gatt_main.c @@ -96,6 +96,7 @@ void gatt_init (void) GATT_TRACE_DEBUG("gatt_init()"); memset (&gatt_cb, 0, sizeof(tGATT_CB)); + memset (&fixed_reg, 0, sizeof(tL2CAP_FIXED_CHNL_REG)); #if defined(GATT_INITIAL_TRACE_LEVEL) gatt_cb.trace_level = GATT_INITIAL_TRACE_LEVEL; @@ -1017,20 +1018,18 @@ void gatt_data_process (tGATT_TCB *p_tcb, BT_HDR *p_buf) *******************************************************************************/ void gatt_add_a_bonded_dev_for_srv_chg (BD_ADDR bda) { - tGATTS_SRV_CHG *p_buf; tGATTS_SRV_CHG_REQ req; tGATTS_SRV_CHG srv_chg_clt; memcpy(srv_chg_clt.bda, bda, BD_ADDR_LEN); srv_chg_clt.srv_changed = FALSE; - if ((p_buf = gatt_add_srv_chg_clt(&srv_chg_clt)) != NULL) + if (gatt_add_srv_chg_clt(&srv_chg_clt) != NULL) { memcpy(req.srv_chg.bda, bda, BD_ADDR_LEN); req.srv_chg.srv_changed = FALSE; if (gatt_cb.cb_info.p_srv_chg_callback) (*gatt_cb.cb_info.p_srv_chg_callback)(GATTS_SRV_CHG_CMD_ADD_CLIENT, &req, NULL); } - } /******************************************************************************* |