Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10b2ed6d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7333400 from 688db20e to sc-release 

Change-Id: I6a78be512fdc5b6d3cb1b4afa7d543b400b271aa
parents 58654769 688db20e

system/bta/Android.bp

+12 −30
Original line number Diff line number Diff line
@@ -160,8 +160,19 @@ cc_test { 
    host_supported: true,

    include_dirs: [

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/gd",

    ],

    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    srcs: [

        ":TestMockBtif",

        ":TestMockDevice",

        ":TestMockMainShim",

        ":TestMockStack",

        ":TestStubOsi",

        "dm/bta_dm_act.cc",

        "dm/bta_dm_cfg.cc",

        "dm/bta_dm_ci.cc",
@@ -183,39 +194,10 @@ cc_test { 
        "sys/bta_sys_conn.cc",

        "sys/bta_sys_main.cc",

        "test/bta_dm_test.cc",

        "test/common/fake_osi.cc",

        "test/common/mock_btif_co_bta_dm_co.cc",

        "test/common/mock_btif_co_bta_hh_co.cc",

        "test/common/mock_btif_debug_conn.cc",

        "test/common/mock_btif_dm.cc",

        "test/common/mock_btif_stack_manager.cc",

        "test/common/mock_btif_storage.cc",

        "test/common/mock_device_controller.cc",

        "test/common/mock_device_interop.cc",

        "test/common/mock_main_shim_acl.cc",

        "test/common/mock_main_shim_btm_api.cc",

        "test/common/mock_shim.cc",

        "test/common/mock_stack_acl.cc",

        "test/common/mock_stack_btm.cc",

        "test/common/mock_stack_btm_ble.cc",

        "test/common/mock_stack_btm_dev.cc",

        "test/common/mock_stack_btm_pm.cc",

        "test/common/mock_stack_btm_sco.cc",

        "test/common/mock_stack_btm_sec.cc",

        "test/common/mock_stack_crypto_toolbox_aes_cmac.cc",

        "test/common/mock_stack_gap_ble.cc",

        "test/common/mock_stack_btm_main.cc",

        "test/common/mock_stack_gatt.cc",

        "test/common/mock_stack_gatt_attr.cc",

        "test/common/mock_stack_gatt_connection_manager.cc",

        "test/common/mock_stack_hidh.cc",

        "test/common/mock_stack_l2cap.cc",

        "test/common/mock_stack_l2cap_ble.cc",

        "test/common/mock_stack_sdp.cc",

        "test/common/mock_stack_srvc_dis.cc",

    ],

    shared_libs: [

        "libcrypto",

        "libflatbuffers-cpp",

        "liblog",

        "libprotobuf-cpp-lite",

    ],

system/bta/gatt/bta_gattc_int.h

+1 −3
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ typedef uint16_t tBTA_GATTC_INT_EVT; 
#define BTA_GATTC_KNOWN_SR_MAX 255

#endif



#define BTA_GATTC_CONN_MAX GATT_MAX_PHY_CHANNEL



#ifndef BTA_GATTC_CLCB_MAX

#define BTA_GATTC_CLCB_MAX GATT_CL_MAX_LCB

#endif
@@ -305,7 +303,7 @@ enum { 
typedef struct {

  uint8_t state;



  tBTA_GATTC_CONN conn_track[BTA_GATTC_CONN_MAX];

  tBTA_GATTC_CONN conn_track[GATT_MAX_PHY_CHANNEL];

  tBTA_GATTC_BG_TCK bg_track[BTA_GATTC_KNOWN_SR_MAX];

  tBTA_GATTC_RCB cl_rcb[BTA_GATTC_CL_MAX];

system/bta/gatt/bta_gattc_utils.cc

+2 −2
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ tBTA_GATTC_CONN* bta_gattc_conn_alloc(const RawAddress& remote_bda) { 
  uint8_t i_conn = 0;

  tBTA_GATTC_CONN* p_conn = &bta_gattc_cb.conn_track[0];



  for (i_conn = 0; i_conn < BTA_GATTC_CONN_MAX; i_conn++, p_conn++) {

  for (i_conn = 0; i_conn < GATT_MAX_PHY_CHANNEL; i_conn++, p_conn++) {

    if (!p_conn->in_use) {

#if (BTA_GATT_DEBUG == TRUE)

      VLOG(1) << __func__ << ": found conn_track:" << +i_conn << " available";
@@ -552,7 +552,7 @@ tBTA_GATTC_CONN* bta_gattc_conn_find(const RawAddress& remote_bda) { 
  uint8_t i_conn = 0;

  tBTA_GATTC_CONN* p_conn = &bta_gattc_cb.conn_track[0];



  for (i_conn = 0; i_conn < BTA_GATTC_CONN_MAX; i_conn++, p_conn++) {

  for (i_conn = 0; i_conn < GATT_MAX_PHY_CHANNEL; i_conn++, p_conn++) {

    if (p_conn->in_use && remote_bda == p_conn->remote_bda) {

#if (BTA_GATT_DEBUG == TRUE)

      VLOG(1) << __func__ << ": found conn_track:" << +i_conn << " matched";

system/bta/hh/bta_hh_act.cc

+16 −20
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static void bta_hh_di_sdp_cback(tSDP_RESULT result) { 
 * Returns          void

 *

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

void bta_hh_start_sdp(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_start_sdp(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  tBTA_HH_STATUS status = BTA_HH_ERR_SDP;

  uint8_t hdl;
@@ -388,7 +388,7 @@ void bta_hh_start_sdp(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 * Returns          void

 *

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

void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  CHECK(p_data != nullptr);



  tBTA_HH_CONN conn_dat;
@@ -471,7 +471,8 @@ void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 * Returns          void

 *

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

void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

extern void btif_hh_remove_device(RawAddress bd_addr);

void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  CHECK(p_cb != nullptr);



  if (p_cb->is_le_device) {
@@ -479,8 +480,6 @@ void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
              PRIVATE_ADDRESS(p_cb->addr));



    bta_hh_le_api_disc_act(p_cb);

    BTM_LogHistory(kBtmLogTag, p_cb->addr, "Closed",

                   base::StringPrintf("le local initiated"));



  } else {

    const uint8_t hid_handle =
@@ -500,9 +499,6 @@ void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
                       .handle = hid_handle},

    };

    (*bta_hh_cb.p_cback)(BTA_HH_CLOSE_EVT, &bta_hh);

    BTM_LogHistory(kBtmLogTag, p_cb->addr, "Closed",

                   base::StringPrintf("classic local reason %s",

                                      hid_status_text(status).c_str()));

  }

}
@@ -516,7 +512,7 @@ void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 * Returns          void

 *

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

void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  tBTA_HH_CONN conn;

  uint8_t dev_handle =

      p_data ? (uint8_t)p_data->hid_cback.hdr.layer_specific : p_cb->hid_handle;
@@ -539,7 +535,7 @@ void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
  BTM_LogHistory(kBtmLogTag, p_cb->addr, "Opened",

                 base::StringPrintf(

                     "%s initiator:%s", (p_cb->is_le_device) ? "le" : "classic",

                     (p_cb->incoming_conn) ? "local" : "remote"));

                     (p_cb->incoming_conn) ? "remote" : "local"));



  if (!p_cb->is_le_device)

  {
@@ -576,7 +572,7 @@ void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 * Returns          void

 *

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

void bta_hh_open_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_open_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  tBTA_HH_API_CONN conn_data;



  uint8_t dev_handle =
@@ -614,7 +610,7 @@ void bta_hh_open_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 * Returns          void

 *

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

void bta_hh_data_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_data_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  BT_HDR* pdata = p_data->hid_cback.p_data;

  uint8_t* p_rpt = (uint8_t*)(pdata + 1) + pdata->offset;
@@ -635,7 +631,7 @@ void bta_hh_data_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 * Returns          void

 *

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

void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  APPL_TRACE_DEBUG("HANDSHAKE received for: event = %s data= %d",

                   bta_hh_get_w4_event(p_cb->w4_evt), p_data->hid_cback.data);
@@ -706,7 +702,7 @@ void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 * Returns          void

 *

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

void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  BT_HDR* pdata = p_data->hid_cback.p_data;

  uint8_t* data = (uint8_t*)(pdata + 1) + pdata->offset;

  tBTA_HH_HSDATA hs_data;
@@ -775,7 +771,7 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 * Returns          void

 *

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

void bta_hh_open_failure(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_open_failure(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  tBTA_HH_CONN conn_dat;

  uint32_t reason = p_data->hid_cback.data; /* Reason for closing (32-bit) */
@@ -814,7 +810,7 @@ void bta_hh_open_failure(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 * Returns          void

 *

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

void bta_hh_close_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_close_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  tBTA_HH_CONN conn_dat;

  tBTA_HH_CBDATA disc_dat = {BTA_HH_OK, 0};
@@ -906,7 +902,7 @@ void bta_hh_close_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) { 
 *

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

void bta_hh_get_dscp_act(tBTA_HH_DEV_CB* p_cb,

                         UNUSED_ATTR tBTA_HH_DATA* p_data) {

                         UNUSED_ATTR const tBTA_HH_DATA* p_data) {

  if (p_cb->is_le_device) {

    bta_hh_le_get_dscp_act(p_cb);

  } else
@@ -923,8 +919,8 @@ void bta_hh_get_dscp_act(tBTA_HH_DEV_CB* p_cb, 
 * Returns          void

 *

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

void bta_hh_maint_dev_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

  tBTA_HH_MAINT_DEV* p_dev_info = &p_data->api_maintdev;

void bta_hh_maint_dev_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  const tBTA_HH_MAINT_DEV* p_dev_info = &p_data->api_maintdev;

  tBTA_HH_DEV_INFO dev_info;

  uint8_t dev_handle;
@@ -1014,7 +1010,7 @@ static uint8_t convert_api_sndcmd_param(const tBTA_HH_CMD_DATA& api_sndcmd) { 
  return api_sndcmd_param;

}



void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {

void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  tBTA_HH_CBDATA cbdata = {BTA_HH_OK, 0};

  uint16_t event = (p_data->api_sndcmd.t_type - BTA_HH_FST_BTE_TRANS_EVT) +

                   BTA_HH_FST_TRANS_CB_EVT;

system/bta/hh/bta_hh_int.h

+37 −25
Original line number Diff line number Diff line
@@ -284,22 +284,29 @@ extern tBTA_HH_CFG* p_bta_hh_cfg; 
 ****************************************************************************/

extern bool bta_hh_hdl_event(BT_HDR_RIGID* p_msg);

extern void bta_hh_sm_execute(tBTA_HH_DEV_CB* p_cb, uint16_t event,

                              tBTA_HH_DATA* p_data);

                              const tBTA_HH_DATA* p_data);



/* action functions */

extern void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_open_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_close_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_data_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_start_sdp(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_get_dscp_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_maint_dev_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_open_failure(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_api_disc_act(tBTA_HH_DEV_CB* p_cb,

                                const tBTA_HH_DATA* p_data);

extern void bta_hh_open_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data);

extern void bta_hh_close_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data);

extern void bta_hh_data_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data);

extern void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb,

                                const tBTA_HH_DATA* p_data);

extern void bta_hh_start_sdp(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data);

extern void bta_hh_sdp_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data);

extern void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb,

                                 const tBTA_HH_DATA* p_data);

extern void bta_hh_get_dscp_act(tBTA_HH_DEV_CB* p_cb,

                                const tBTA_HH_DATA* p_data);

extern void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data);

extern void bta_hh_maint_dev_act(tBTA_HH_DEV_CB* p_cb,

                                 const tBTA_HH_DATA* p_data);

extern void bta_hh_open_cmpl_act(tBTA_HH_DEV_CB* p_cb,

                                 const tBTA_HH_DATA* p_data);

extern void bta_hh_open_failure(tBTA_HH_DEV_CB* p_cb,

                                const tBTA_HH_DATA* p_data);



/* utility functions */

extern uint8_t bta_hh_find_cb(const RawAddress& bda);
@@ -312,7 +319,7 @@ extern void bta_hh_clean_up_kdev(tBTA_HH_DEV_CB* p_cb); 


extern void bta_hh_add_device_to_list(tBTA_HH_DEV_CB* p_cb, uint8_t handle,

                                      uint16_t attr_mask,

                                      tHID_DEV_DSCP_INFO* p_dscp_info,

                                      const tHID_DEV_DSCP_INFO* p_dscp_info,

                                      uint8_t sub_class, uint16_t max_latency,

                                      uint16_t min_tout, uint8_t app_id);

extern void bta_hh_update_di_info(tBTA_HH_DEV_CB* p_cb, uint16_t vendor_id,
@@ -341,19 +348,24 @@ extern void bta_hh_le_open_conn(tBTA_HH_DEV_CB* p_cb, 
                                const RawAddress& remote_bda);

extern void bta_hh_le_api_disc_act(tBTA_HH_DEV_CB* p_cb);

extern void bta_hh_le_get_dscp_act(tBTA_HH_DEV_CB* p_cb);

extern void bta_hh_le_write_dev_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_le_write_dev_act(tBTA_HH_DEV_CB* p_cb,

                                    const tBTA_HH_DATA* p_data);

extern uint8_t bta_hh_le_add_device(tBTA_HH_DEV_CB* p_cb,

                                    tBTA_HH_MAINT_DEV* p_dev_info);

                                    const tBTA_HH_MAINT_DEV* p_dev_info);

extern void bta_hh_le_remove_dev_bg_conn(tBTA_HH_DEV_CB* p_cb);

extern void bta_hh_le_open_fail(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_gatt_open(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_gatt_close(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data);

extern void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_buf);



extern void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_buf);

extern void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_buf);

extern void bta_hh_le_open_fail(tBTA_HH_DEV_CB* p_cb,

                                const tBTA_HH_DATA* p_data);

extern void bta_hh_gatt_open(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data);

extern void bta_hh_gatt_close(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data);

extern void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb,

                                  const tBTA_HH_DATA* p_buf);



extern void bta_hh_start_security(tBTA_HH_DEV_CB* p_cb,

                                  const tBTA_HH_DATA* p_buf);

extern void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb,

                                 const tBTA_HH_DATA* p_buf);

extern void bta_hh_le_notify_enc_cmpl(tBTA_HH_DEV_CB* p_cb,

                                      tBTA_HH_DATA* p_data);

                                      const tBTA_HH_DATA* p_data);



#if (BTA_HH_DEBUG == TRUE)

extern void bta_hh_trace_dev_db(void);