Commit: 1297a28b2b47f625413e7f416c7629967c6944e1 - system-bt (git)

system/bt

Commit MetaInfo

• Revision: 1297a28b2b47f625413e7f416c7629967c6944e1 (tree)
• Zeit: 2017-05-28 16:22:55
• Autor: android-build-team Robot <android-build-team-robot@goog...>
• Commiter: android-build-team Robot

Log Message

release-request-fca2b5ac-03eb-4055-a549-b4fc2b292b64-for-git_oc-release-4049993 snap-temp-L04900000068539456

Change-Id: I7af38c959146a9406c712a170ffa6a9c380c3299

Ändern Zusammenfassung

• modified: bta/dm/bta_dm_act.cc
• modified: bta/gatt/bta_gattc_act.cc
• modified: bta/gatt/bta_gattc_api.cc
• modified: bta/gatt/bta_gattc_int.h
• modified: bta/hh/bta_hh_le.cc
• modified: bta/include/bta_gatt_api.h
• modified: btif/src/bluetooth.cc
• modified: stack/gap/gap_ble.cc
• modified: stack/include/mca_api.h
• modified: stack/mcap/mca_api.cc

Diff

--- a/bta/dm/bta_dm_act.cc
+++ b/bta/dm/bta_dm_act.cc
@@ -4639,9 +4639,15 @@ void btm_dm_start_gatt_discovery(BD_ADDR bd_addr) {
     memset(bta_dm_search_cb.pending_close_bda, 0, BD_ADDR_LEN);
     alarm_cancel(bta_dm_search_cb.gatt_close_timer);
     btm_dm_start_disc_gatt_services(bta_dm_search_cb.conn_id);
-  } else
-    BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, true,
-                   BTA_GATT_TRANSPORT_LE);
+  } else {
+    if (BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_LE)) {
+      BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, true,
+                     BTA_GATT_TRANSPORT_LE, true);
+    } else {
+      BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, true,
+                     BTA_GATT_TRANSPORT_LE, false);
+    }
+  }
 }
 
 /*******************************************************************************

--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -432,7 +432,7 @@ void bta_gattc_open(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {
 
   /* open/hold a connection */
   if (!GATT_Connect(p_clcb->p_rcb->client_if, p_data->api_conn.remote_bda, true,
-                    p_data->api_conn.transport, false,
+                    p_data->api_conn.transport, p_data->api_conn.opportunistic,
                     p_data->api_conn.initiating_phys)) {
     APPL_TRACE_ERROR("Connection open failure");
 

--- a/bta/gatt/bta_gattc_api.cc
+++ b/bta/gatt/bta_gattc_api.cc
@@ -127,16 +127,20 @@ void BTA_GATTC_AppDeregister(tBTA_GATTC_IF client_if) {
  *                  transport: Transport to be used for GATT connection
  *                             (BREDR/LE)
  *                  initiating_phys: LE PHY to use, optional
+ *                  opportunistic: wether the connection shall be opportunistic,
+ *                                 and don't impact the disconnection timer
  *
  ******************************************************************************/
 void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, bool is_direct,
-                    tBTA_GATT_TRANSPORT transport) {
+                    tBTA_GATT_TRANSPORT transport, bool opportunistic) {
   uint8_t phy = controller_get_interface()->get_le_all_initiating_phys();
-  BTA_GATTC_Open(client_if, remote_bda, is_direct, transport, phy);
+  BTA_GATTC_Open(client_if, remote_bda, is_direct, transport, phy,
+                 opportunistic);
 }
 
 void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, bool is_direct,
-                    tBTA_GATT_TRANSPORT transport, uint8_t initiating_phys) {
+                    tBTA_GATT_TRANSPORT transport, uint8_t initiating_phys,
+                    bool opportunistic) {
   tBTA_GATTC_API_OPEN* p_buf =
       (tBTA_GATTC_API_OPEN*)osi_malloc(sizeof(tBTA_GATTC_API_OPEN));
 
@@ -145,6 +149,7 @@ void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, bool is_direct,
   p_buf->is_direct = is_direct;
   p_buf->transport = transport;
   p_buf->initiating_phys = initiating_phys;
+  p_buf->opportunistic = opportunistic;
   memcpy(p_buf->remote_bda, remote_bda, BD_ADDR_LEN);
 
   bta_sys_sendmsg(p_buf);

--- a/bta/gatt/bta_gattc_int.h
+++ b/bta/gatt/bta_gattc_int.h
@@ -102,6 +102,7 @@ typedef struct {
   bool is_direct;
   tBTA_TRANSPORT transport;
   uint8_t initiating_phys;
+  bool opportunistic;
 } tBTA_GATTC_API_OPEN;
 
 typedef tBTA_GATTC_API_OPEN tBTA_GATTC_API_CANCEL_OPEN;

--- a/bta/hh/bta_hh_le.cc
+++ b/bta/hh/bta_hh_le.cc
@@ -400,7 +400,8 @@ void bta_hh_le_open_conn(tBTA_HH_DEV_CB* p_cb, BD_ADDR remote_bda) {
   bta_hh_cb.le_cb_index[BTA_HH_GET_LE_CB_IDX(p_cb->hid_handle)] = p_cb->index;
   p_cb->in_use = true;
 
-  BTA_GATTC_Open(bta_hh_cb.gatt_if, remote_bda, true, BTA_GATT_TRANSPORT_LE);
+  BTA_GATTC_Open(bta_hh_cb.gatt_if, remote_bda, true, BTA_GATT_TRANSPORT_LE,
+                 false);
 }
 
 /*******************************************************************************
@@ -2113,7 +2114,8 @@ static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB* p_cb, bool check_bond) {
   if (/*p_cb->dscp_info.flag & BTA_HH_LE_NORMAL_CONN &&*/
       !p_cb->in_bg_conn && to_add) {
     /* add device into BG connection to accept remote initiated connection */
-    BTA_GATTC_Open(bta_hh_cb.gatt_if, p_cb->addr, false, BTA_GATT_TRANSPORT_LE);
+    BTA_GATTC_Open(bta_hh_cb.gatt_if, p_cb->addr, false, BTA_GATT_TRANSPORT_LE,
+                   false);
     p_cb->in_bg_conn = true;
 
     BTA_DmBleStartAutoConn();

--- a/bta/include/bta_gatt_api.h
+++ b/bta/include/bta_gatt_api.h
@@ -639,10 +639,11 @@ extern void BTA_GATTC_AppDeregister(tBTA_GATTC_IF client_if);
  *
  ******************************************************************************/
 extern void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda,
-                           bool is_direct, tBTA_GATT_TRANSPORT transport);
+                           bool is_direct, tBTA_GATT_TRANSPORT transport,
+                           bool opportunistic);
 extern void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda,
                            bool is_direct, tBTA_GATT_TRANSPORT transport,
-                           uint8_t initiating_phys);
+                           uint8_t initiating_phys, bool opportunistic);
 
 /*******************************************************************************
  *

--- a/btif/src/bluetooth.cc
+++ b/btif/src/bluetooth.cc
@@ -66,6 +66,9 @@
 #include "osi/include/wakelock.h"
 #include "stack_manager.h"
 
+/* Test interface includes */
+#include "mca_api.h"
+
 /*******************************************************************************
  *  Static variables
  ******************************************************************************/
@@ -107,6 +110,9 @@ extern btrc_interface_t* btif_rc_ctrl_get_interface();
 /*SDP search client*/
 extern btsdp_interface_t* btif_sdp_get_interface();
 
+/* List all test interface here */
+extern btmcap_test_interface_t* stack_mcap_get_interface();
+
 /*******************************************************************************
  *  Functions
  ******************************************************************************/
@@ -364,6 +370,9 @@ static const void* get_profile_interface(const char* profile_id) {
   if (is_profile(profile_id, BT_PROFILE_AV_RC_CTRL_ID))
     return btif_rc_ctrl_get_interface();
 
+  if (is_profile(profile_id, BT_TEST_INTERFACE_MCAP_ID))
+    return stack_mcap_get_interface();
+
   return NULL;
 }
 

--- a/stack/gap/gap_ble.cc
+++ b/stack/gap/gap_ble.cc
@@ -87,15 +87,7 @@ tGAP_CLCB* gap_find_clcb_by_bd_addr(BD_ADDR bda) {
   return NULL;
 }
 
-/*******************************************************************************
- *
- * Function         gap_ble_find_clcb_by_conn_id
- *
- * Description      The function searches all LCB with macthing connection ID
- *
- * Returns          total number of clcb found.
- *
- ******************************************************************************/
+/* returns LCB with matching connection ID, or NULL if not found */
 tGAP_CLCB* gap_ble_find_clcb_by_conn_id(uint16_t conn_id) {
   uint8_t i_clcb;
   tGAP_CLCB* p_clcb = NULL;
@@ -107,7 +99,7 @@ tGAP_CLCB* gap_ble_find_clcb_by_conn_id(uint16_t conn_id) {
     }
   }
 
-  return p_clcb;
+  return NULL;
 }
 
 /*******************************************************************************
@@ -132,10 +124,10 @@ tGAP_CLCB* gap_clcb_alloc(BD_ADDR bda) {
       p_clcb->in_use = true;
       memcpy(p_clcb->bda, bda, BD_ADDR_LEN);
       p_clcb->pending_req_q = fixed_queue_new(SIZE_MAX);
-      break;
+      return p_clcb;
     }
   }
-  return p_clcb;
+  return NULL;
 }
 
 /*******************************************************************************
@@ -684,8 +676,7 @@ bool gap_ble_accept_cl_operation(BD_ADDR peer_bda, uint16_t uuid,
                                 BT_TRANSPORT_LE))
     p_clcb->connected = true;
 
-  /* hold the link here */
-  if (!GATT_Connect(gap_cb.gatt_if, p_clcb->bda, true, BT_TRANSPORT_LE, false))
+  if (!GATT_Connect(gap_cb.gatt_if, p_clcb->bda, true, BT_TRANSPORT_LE, true))
     return started;
 
   /* enqueue the request */

--- a/stack/include/mca_api.h
+++ b/stack/include/mca_api.h
@@ -511,4 +511,43 @@ extern tMCA_RESULT MCA_WriteReq(tMCA_DL mdl, BT_HDR* p_pkt);
  ******************************************************************************/
 extern uint16_t MCA_GetL2CapChannel(tMCA_DL mdl);
 
+/**
+ * The following definitions are for test interface only, they mirror function
+ * definitions above. This struct allows an external application to load and
+ * call these methods without linking against the core library.
+ */
+typedef struct {
+  size_t size;
+  void (*init)(void);
+  tMCA_HANDLE (*register_application)(tMCA_REG* p_reg,
+                                      tMCA_CTRL_CBACK* p_cback);
+  void (*deregister_application)(tMCA_HANDLE handle);
+  tMCA_RESULT (*create_mdep)(tMCA_HANDLE handle, tMCA_DEP* p_dep,
+                             tMCA_CS* p_cs);
+  tMCA_RESULT (*delete_mdep)(tMCA_HANDLE handle, tMCA_DEP dep);
+  tMCA_RESULT (*connect_mcl)(tMCA_HANDLE handle, BD_ADDR bd_addr,
+                             uint16_t ctrl_psm, uint16_t sec_mask);
+  tMCA_RESULT (*disconnect_mcl)(tMCA_CL mcl);
+  tMCA_RESULT (*create_mdl_request)(tMCA_CL mcl, tMCA_DEP dep,
+                                    uint16_t data_psm, uint16_t mdl_id,
+                                    uint8_t peer_dep_id, uint8_t cfg,
+                                    const tMCA_CHNL_CFG* p_chnl_cfg);
+  tMCA_RESULT (*create_mdl_response)(tMCA_CL mcl, tMCA_DEP dep, uint16_t mdl_id,
+                                     uint8_t cfg, uint8_t rsp_code,
+                                     const tMCA_CHNL_CFG* p_chnl_cfg);
+  tMCA_RESULT (*close_mdl_request)(tMCA_DL mdl);
+  tMCA_RESULT (*reconnect_mdl_request)(tMCA_CL mcl, tMCA_DEP dep,
+                                       uint16_t data_psm, uint16_t mdl_id,
+                                       const tMCA_CHNL_CFG* p_chnl_cfg);
+  tMCA_RESULT (*reconnect_mdl_response)(tMCA_CL mcl, tMCA_DEP dep,
+                                        uint16_t mdl_id, uint8_t rsp_code,
+                                        const tMCA_CHNL_CFG* p_chnl_cfg);
+  tMCA_RESULT (*data_channel_config)(tMCA_CL mcl,
+                                     const tMCA_CHNL_CFG* p_chnl_cfg);
+  tMCA_RESULT (*abort_mdl)(tMCA_CL mcl);
+  tMCA_RESULT (*delete_mdl)(tMCA_CL mcl, uint16_t mdl_id);
+  tMCA_RESULT (*write_mdl)(tMCA_DL mdl, BT_HDR* p_pkt);
+  uint16_t (*get_l2cap_channel)(tMCA_DL mdl);
+} btmcap_test_interface_t;
+
 #endif /* MCA_API_H */

--- a/stack/mcap/mca_api.cc
+++ b/stack/mcap/mca_api.cc
@@ -827,3 +827,29 @@ uint16_t MCA_GetL2CapChannel(tMCA_DL mdl) {
   if (p_dcb) lcid = p_dcb->lcid;
   return lcid;
 }
+
+static const btmcap_test_interface_t mcap_test_interface = {
+    sizeof(btmcap_test_interface_t),
+    MCA_Init,
+    MCA_Register,
+    MCA_Deregister,
+    MCA_CreateDep,
+    MCA_DeleteDep,
+    MCA_ConnectReq,
+    MCA_DisconnectReq,
+    MCA_CreateMdl,
+    MCA_CreateMdlRsp,
+    MCA_CloseReq,
+    MCA_ReconnectMdl,
+    MCA_ReconnectMdlRsp,
+    MCA_DataChnlCfg,
+    MCA_Abort,
+    MCA_Delete,
+    MCA_WriteReq,
+    MCA_GetL2CapChannel,
+};
+
+const btmcap_test_interface_t* stack_mcap_get_interface(void) {
+  BTIF_TRACE_EVENT("%s", __func__);
+  return &mcap_test_interface;
+}