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

Commit be3bc993 authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-19019716-QBLRMXGUHH" into tm-dev am: f2cd2308 am: 1cf1e271 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/19120542



Change-Id: I43225a9e847bcc0671e5f3c06c1e5ff04aeda8a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3833970 1cf1e271

system/bta/dm/bta_dm_act.cc

+59 −23
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "main/shim/shim.h"

#include "osi/include/allocator.h"

#include "osi/include/compat.h"

#include "osi/include/fixed_queue.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/btm/btm_ble_int.h"
@@ -320,6 +321,8 @@ void BTA_dm_on_hw_off() { 
  /* hw is ready, go on with BTA DM initialization */

  alarm_free(bta_dm_search_cb.search_timer);

  alarm_free(bta_dm_search_cb.gatt_close_timer);

  osi_free(bta_dm_search_cb.p_pending_search);

  fixed_queue_free(bta_dm_search_cb.pending_discovery_queue, osi_free);

  memset(&bta_dm_search_cb, 0, sizeof(bta_dm_search_cb));

}
@@ -339,6 +342,8 @@ void BTA_dm_on_hw_on() { 
  /* hw is ready, go on with BTA DM initialization */

  alarm_free(bta_dm_search_cb.search_timer);

  alarm_free(bta_dm_search_cb.gatt_close_timer);

  osi_free(bta_dm_search_cb.p_pending_search);

  fixed_queue_free(bta_dm_search_cb.pending_discovery_queue, osi_free);

  memset(&bta_dm_search_cb, 0, sizeof(bta_dm_search_cb));

  /*

   * TODO: Should alarm_free() the bta_dm_search_cb timers during
@@ -347,6 +352,7 @@ void BTA_dm_on_hw_on() { 
  bta_dm_search_cb.search_timer = alarm_new("bta_dm_search.search_timer");

  bta_dm_search_cb.gatt_close_timer =

      alarm_new("bta_dm_search.gatt_close_timer");

  bta_dm_search_cb.pending_discovery_queue = fixed_queue_new(SIZE_MAX);



  memset(&bta_dm_conn_srvcs, 0, sizeof(bta_dm_conn_srvcs));

  memset(&bta_dm_di_cb, 0, sizeof(tBTA_DM_DI_CB));
@@ -990,7 +996,7 @@ static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr, 
void bta_dm_inq_cmpl(uint8_t num) {

  if (bta_dm_search_get_state() == BTA_DM_SEARCH_CANCELLING) {

    bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

    bta_dm_search_cancel_cmpl();

    bta_dm_execute_queued_request();

    return;

  }
@@ -1289,6 +1295,7 @@ void bta_dm_search_cmpl() { 
  /* no BLE connection, i.e. Classic service discovery end */

  if (conn_id == GATT_INVALID_CONN_ID) {

    bta_dm_search_cb.p_search_cback(BTA_DM_DISC_CMPL_EVT, nullptr);

    bta_dm_execute_queued_request();

    return;

  }
@@ -1299,6 +1306,7 @@ void bta_dm_search_cmpl() { 
  if (count == 0) {

    LOG_INFO("Empty GATT database - no BLE services discovered");

    bta_dm_search_cb.p_search_cback(BTA_DM_DISC_CMPL_EVT, nullptr);

    bta_dm_execute_queued_request();

    return;

  }
@@ -1323,6 +1331,8 @@ void bta_dm_search_cmpl() { 
  bta_dm_search_cb.p_search_cback(BTA_DM_DISC_BLE_RES_EVT, &result);



  bta_dm_search_cb.p_search_cback(BTA_DM_DISC_CMPL_EVT, nullptr);



  bta_dm_execute_queued_request();

}



/*******************************************************************************
@@ -1419,13 +1429,13 @@ void bta_dm_free_sdp_db() { 
 *

 * Function         bta_dm_queue_search

 *

 * Description      Queues search command while search is being cancelled

 * Description      Queues search command

 *

 * Returns          void

 *

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

void bta_dm_queue_search(tBTA_DM_MSG* p_data) {

  bta_dm_search_clear_queue();

  osi_free_and_reset((void**)&bta_dm_search_cb.p_pending_search);

  bta_dm_search_cb.p_pending_search =

      (tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_API_SEARCH));

  memcpy(bta_dm_search_cb.p_pending_search, p_data, sizeof(tBTA_DM_API_SEARCH));
@@ -1435,50 +1445,76 @@ void bta_dm_queue_search(tBTA_DM_MSG* p_data) { 
 *

 * Function         bta_dm_queue_disc

 *

 * Description      Queues discovery command while search is being cancelled

 * Description      Queues discovery command

 *

 * Returns          void

 *

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

void bta_dm_queue_disc(tBTA_DM_MSG* p_data) {

  bta_dm_search_clear_queue();

  bta_dm_search_cb.p_pending_discovery =

  tBTA_DM_MSG* p_pending_discovery =

      (tBTA_DM_MSG*)osi_malloc(sizeof(tBTA_DM_API_DISCOVER));

  memcpy(bta_dm_search_cb.p_pending_discovery, p_data,

         sizeof(tBTA_DM_API_DISCOVER));

  memcpy(p_pending_discovery, p_data, sizeof(tBTA_DM_API_DISCOVER));

  fixed_queue_enqueue(bta_dm_search_cb.pending_discovery_queue,

                      p_pending_discovery);

}



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

 *

 * Function         bta_dm_search_clear_queue

 * Function         bta_dm_execute_queued_request

 *

 * Description      Clears the queue if API search cancel is called

 * Description      Executes queued request if one exists

 *

 * Returns          void

 *

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

void bta_dm_search_clear_queue() {

  osi_free_and_reset((void**)&bta_dm_search_cb.p_pending_search);

  osi_free_and_reset((void**)&bta_dm_search_cb.p_pending_discovery);

void bta_dm_execute_queued_request() {

  if (bta_dm_search_cb.p_pending_search) {

    // Updated queued event to search event to trigger start search

    if (bta_dm_search_cb.p_pending_search->hdr.event ==

        BTA_DM_API_QUEUE_SEARCH_EVT) {

      bta_dm_search_cb.p_pending_search->hdr.event = BTA_DM_API_SEARCH_EVT;

    }

    LOG_INFO("%s Start pending search", __func__);

    bta_sys_sendmsg(bta_dm_search_cb.p_pending_search);

    bta_dm_search_cb.p_pending_search = NULL;

  } else {

    tBTA_DM_MSG* p_pending_discovery = (tBTA_DM_MSG*)fixed_queue_try_dequeue(

        bta_dm_search_cb.pending_discovery_queue);

    if (p_pending_discovery) {

      if (p_pending_discovery->hdr.event == BTA_DM_API_QUEUE_DISCOVER_EVT) {

        p_pending_discovery->hdr.event = BTA_DM_API_DISCOVER_EVT;

      }

      LOG_INFO("%s Start pending discovery", __func__);

      bta_sys_sendmsg(p_pending_discovery);

    }

  }

}



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

 *

 * Function         bta_dm_search_cancel_cmpl

 * Function         bta_dm_is_search_request_queued

 *

 * Description      Search cancel is complete

 * Description      Checks if there is a queued search request

 *

 * Returns          void

 * Returns          bool

 *

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

void bta_dm_search_cancel_cmpl() {

  if (bta_dm_search_cb.p_pending_search) {

    bta_sys_sendmsg(bta_dm_search_cb.p_pending_search);

    bta_dm_search_cb.p_pending_search = NULL;

  } else if (bta_dm_search_cb.p_pending_discovery) {

    bta_sys_sendmsg(bta_dm_search_cb.p_pending_discovery);

    bta_dm_search_cb.p_pending_discovery = NULL;

bool bta_dm_is_search_request_queued() {

  return bta_dm_search_cb.p_pending_search != NULL;

}



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

 *

 * Function         bta_dm_search_clear_queue

 *

 * Description      Clears the queue if API search cancel is called

 *

 * Returns          void

 *

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

void bta_dm_search_clear_queue() {

  osi_free_and_reset((void**)&bta_dm_search_cb.p_pending_search);

  fixed_queue_flush(bta_dm_search_cb.pending_discovery_queue, osi_free);

}



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

system/bta/dm/bta_dm_api.cc

+15 −5
Original line number Diff line number Diff line
@@ -80,11 +80,16 @@ void BTA_DmSetDeviceName(const char* p_name) { 
 * Returns          void

 *

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

void BTA_DmSearch(tBTA_DM_SEARCH_CBACK* p_cback) {

void BTA_DmSearch(tBTA_DM_SEARCH_CBACK* p_cback, bool is_bonding_or_sdp) {

  tBTA_DM_API_SEARCH* p_msg =

      (tBTA_DM_API_SEARCH*)osi_calloc(sizeof(tBTA_DM_API_SEARCH));



  /* Queue request if a device is bonding or performing service discovery */

  if (is_bonding_or_sdp) {

    p_msg->hdr.event = BTA_DM_API_QUEUE_SEARCH_EVT;

  } else {

    p_msg->hdr.event = BTA_DM_API_SEARCH_EVT;

  }

  p_msg->p_cback = p_cback;



  bta_sys_sendmsg(p_msg);
@@ -101,6 +106,8 @@ void BTA_DmSearch(tBTA_DM_SEARCH_CBACK* p_cback) { 
 *

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

void BTA_DmSearchCancel(void) {

  bta_dm_search_clear_queue();



  switch (bta_dm_search_get_state()) {

    case BTA_DM_SEARCH_IDLE:

      bta_dm_search_cancel_notify();
@@ -110,7 +117,6 @@ void BTA_DmSearchCancel(void) { 
      bta_dm_search_cancel();

      break;

    case BTA_DM_SEARCH_CANCELLING:

      bta_dm_search_clear_queue();

      bta_dm_search_cancel_notify();

      break;

    case BTA_DM_DISCOVER_ACTIVE:
@@ -132,11 +138,15 @@ void BTA_DmSearchCancel(void) { 
 *

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

void BTA_DmDiscover(const RawAddress& bd_addr, tBTA_DM_SEARCH_CBACK* p_cback,

                    tBT_TRANSPORT transport) {

                    tBT_TRANSPORT transport, bool is_bonding_or_sdp) {

  tBTA_DM_API_DISCOVER* p_msg =

      (tBTA_DM_API_DISCOVER*)osi_calloc(sizeof(tBTA_DM_API_DISCOVER));



  if (is_bonding_or_sdp) {

    p_msg->hdr.event = BTA_DM_API_QUEUE_DISCOVER_EVT;

  } else {

    p_msg->hdr.event = BTA_DM_API_DISCOVER_EVT;

  }

  p_msg->bd_addr = bd_addr;

  p_msg->transport = transport;

  p_msg->p_cback = p_cback;

system/bta/dm/bta_dm_int.h

+8 −5
Original line number Diff line number Diff line
@@ -70,17 +70,19 @@ enum { 
  BTA_DM_SDP_RESULT_EVT,

  BTA_DM_SEARCH_CMPL_EVT,

  BTA_DM_DISCOVERY_RESULT_EVT,

  BTA_DM_DISC_CLOSE_TOUT_EVT

  BTA_DM_DISC_CLOSE_TOUT_EVT,

  BTA_DM_API_QUEUE_SEARCH_EVT,

  BTA_DM_API_QUEUE_DISCOVER_EVT

};



/* data type for BTA_DM_API_SEARCH_EVT */

/* data type for BTA_DM_API_SEARCH_EVT and BTA_DM_API_QUEUE_SEARCH_EVT */

typedef struct {

  BT_HDR_RIGID hdr;

  tBTA_SERVICE_MASK services;

  tBTA_DM_SEARCH_CBACK* p_cback;

} tBTA_DM_API_SEARCH;



/* data type for BTA_DM_API_DISCOVER_EVT */

/* data type for BTA_DM_API_DISCOVER_EVT and BTA_DM_API_QUEUE_DISCOVER_EVT */

typedef struct {

  BT_HDR_RIGID hdr;

  RawAddress bd_addr;
@@ -356,7 +358,7 @@ typedef struct { 
  alarm_t* search_timer;

  uint8_t service_index;

  tBTA_DM_MSG* p_pending_search;

  tBTA_DM_MSG* p_pending_discovery;

  fixed_queue_t* pending_discovery_queue;

  bool wait_disc;

  bool sdp_results;

  bluetooth::Uuid uuid;
@@ -533,8 +535,9 @@ extern void bta_dm_search_result(tBTA_DM_MSG* p_data); 
extern void bta_dm_discovery_cmpl(tBTA_DM_MSG* p_data);

extern void bta_dm_queue_search(tBTA_DM_MSG* p_data);

extern void bta_dm_queue_disc(tBTA_DM_MSG* p_data);

extern void bta_dm_execute_queued_request();

extern bool bta_dm_is_search_request_queued();

extern void bta_dm_search_clear_queue();

extern void bta_dm_search_cancel_cmpl();

extern void bta_dm_search_cancel_notify();

extern void bta_dm_disc_rmt_name(tBTA_DM_MSG* p_data);

extern tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device(

system/bta/dm/bta_dm_main.cc

+21 −1
Original line number Diff line number Diff line
@@ -82,6 +82,12 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          bta_dm_close_gatt_conn(message);

          break;

        case BTA_DM_API_QUEUE_SEARCH_EVT:

          bta_dm_queue_search(message);

          break;

        case BTA_DM_API_QUEUE_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

      }

      break;

    case BTA_DM_SEARCH_ACTIVE:
@@ -101,14 +107,20 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
        case BTA_DM_DISC_CLOSE_TOUT_EVT:

          bta_dm_close_gatt_conn(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

        case BTA_DM_API_QUEUE_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

      }

      break;

    case BTA_DM_SEARCH_CANCELLING:

      switch (p_msg->event) {

        case BTA_DM_API_SEARCH_EVT:

        case BTA_DM_API_QUEUE_SEARCH_EVT:

          bta_dm_queue_search(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

        case BTA_DM_API_QUEUE_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

        case BTA_DM_SDP_RESULT_EVT:
@@ -118,7 +130,7 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
          bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

          bta_dm_free_sdp_db();

          bta_dm_search_cancel_notify();

          bta_dm_search_cancel_cmpl();

          bta_dm_execute_queued_request();

          break;

      }

      break;
@@ -136,6 +148,14 @@ bool bta_dm_search_sm_execute(BT_HDR_RIGID* p_msg) { 
        case BTA_DM_DISCOVERY_RESULT_EVT:

          bta_dm_disc_result(message);

          break;

        case BTA_DM_API_SEARCH_EVT:

        case BTA_DM_API_QUEUE_SEARCH_EVT:

          bta_dm_queue_search(message);

          break;

        case BTA_DM_API_DISCOVER_EVT:

        case BTA_DM_API_QUEUE_DISCOVER_EVT:

          bta_dm_queue_disc(message);

          break;

      }

      break;

  }

system/bta/include/bta_api.h

+5 −3
Original line number Diff line number Diff line
@@ -711,13 +711,15 @@ extern bool BTA_DmSetVisibility(bt_scan_mode_t mode); 
 *                  first performs an inquiry; for each device found from the

 *                  inquiry it gets the remote name of the device.  If

 *                  parameter services is nonzero, service discovery will be

 *                  performed on each device for the services specified.

 *                  performed on each device for the services specified. If the

 *                  parameter is_bonding_or_sdp is true, the request will be

 *                  queued until bonding or sdp completes

 *

 *

 * Returns          void

 *

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

extern void BTA_DmSearch(tBTA_DM_SEARCH_CBACK* p_cback);

extern void BTA_DmSearch(tBTA_DM_SEARCH_CBACK* p_cback, bool is_bonding_or_sdp);



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

 *
@@ -745,7 +747,7 @@ extern void BTA_DmSearchCancel(void); 
 ******************************************************************************/

extern void BTA_DmDiscover(const RawAddress& bd_addr,

                           tBTA_DM_SEARCH_CBACK* p_cback,

                           tBT_TRANSPORT transport);

                           tBT_TRANSPORT transport, bool is_bonding_or_sdp);



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

 *