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

Commit a0e82db7 authored by Archie Pusaka's avatar Archie Pusaka Committed by Archie Pusaka
Browse files

Queue DIS requests 

Instead of rejecting a DIS request when there's already another
ongoing DIS request, just queue it and carry it out as soon as the
first request is done.

Additionally, don't proceed to connect GATT if we're not currently
connected, since we have no handler for both cases where it is failed
and successful. Since we already marked the request as ongoing, any
attempt to connect GATT is guaranteed to block all future DIS requests,
regardless of whether we queue the DIS requests or not.

Bug: 357011645
Bug: 360289803
Test: m -j
Test: Purposely modify the code to invoke tons of DIS request. Verify
      the requests are all carried out.
Flag: com.android.bluetooth.flags.queue_dis_requests

Change-Id: I5e679f99296625a770c45268914262d3d9f48664
parent 276ff7a0

system/stack/srvc/srvc_dis.cc

+51 −11
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define LOG_TAG "bt_srvc"



#include <bluetooth/log.h>

#include <com_android_bluetooth_flags.h>



#include "gatt_api.h"

#include "hardware/bt_gatt_types.h"
@@ -113,6 +114,24 @@ static void dis_gatt_c_read_dis_value_cmpl(uint16_t conn_id) { 
    (*dis_cb.p_read_dis_cback)(p_clcb->bda, &p_clcb->dis_value);

    dis_cb.p_read_dis_cback = NULL;

  }



  if (com::android::bluetooth::flags::queue_dis_requests()) {

    while (!dis_cb.pend_reqs.empty()) {

      tDIS_REQ req = dis_cb.pend_reqs.front();

      dis_cb.pend_reqs.pop();

      log::info("Dequeue pending DIS request. Address:{}, mask:0x{:04x}", req.addr, req.mask);



      /* only process the pending DIS if the device is connected */

      uint16_t _conn_id;

      if (GATT_GetConnIdIfConnected(srvc_eng_cb.gatt_if, req.addr, &_conn_id, BT_TRANSPORT_LE) &&

          DIS_ReadDISInfo(req.addr, req.p_read_dis_cback, req.mask)) {

        break;

      } else if (req.p_read_dis_cback) {

        tDIS_VALUE empty = {};

        req.p_read_dis_cback(req.addr, &empty);

      }

    }

  }

}



/*******************************************************************************
@@ -246,14 +265,33 @@ bool DIS_ReadDISInfo(const RawAddress& peer_bda, tDIS_READ_CBACK* p_cback, tDIS_ 
  /* Initialize the DIS client if it hasn't been initialized already. */

  srvc_eng_init();



  /* For now we only handle one at a time */

  if (p_cback == NULL) {

    return false;

  }



  if (dis_cb.dis_read_uuid_idx != 0xff) {

    if (!com::android::bluetooth::flags::queue_dis_requests()) {

      /* For now we only handle one at a time */

      return false;

    }

    /* GATT is busy, so let's queue the request */

    tDIS_REQ req = {

            .p_read_dis_cback = p_cback,

            .mask = mask,

            .addr = peer_bda,

    };

    dis_cb.pend_reqs.push(req);



    return true;

  }



  if (p_cback == NULL) {

  if (com::android::bluetooth::flags::queue_dis_requests()) {

    /* For now, we don't serve the request if GATT isn't connected.

     * We need to call GATT_Connect and implement the handler for both success and failure case. */

    if (!GATT_GetConnIdIfConnected(srvc_eng_cb.gatt_if, peer_bda, &conn_id, BT_TRANSPORT_LE)) {

      return false;

    }

  }



  dis_cb.p_read_dis_cback = p_cback;

  /* Mark currently active operation */
@@ -263,17 +301,19 @@ bool DIS_ReadDISInfo(const RawAddress& peer_bda, tDIS_READ_CBACK* p_cback, tDIS_ 


  log::verbose("BDA: {} cl_read_uuid: 0x{:04x}", peer_bda, dis_attr_uuid[dis_cb.dis_read_uuid_idx]);



  /* need to enhance it as multiple service is needed */

  srvc_eng_request_channel(peer_bda, SRVC_ID_DIS);



  if (!com::android::bluetooth::flags::queue_dis_requests()) {

    if (!GATT_GetConnIdIfConnected(srvc_eng_cb.gatt_if, peer_bda, &conn_id, BT_TRANSPORT_LE)) {

      conn_id = GATT_INVALID_CONN_ID;

    }



  /* need to enhance it as multiple service is needed */

  srvc_eng_request_channel(peer_bda, SRVC_ID_DIS);



    if (conn_id == GATT_INVALID_CONN_ID) {

      return GATT_Connect(srvc_eng_cb.gatt_if, peer_bda, BTM_BLE_DIRECT_CONNECTION, BT_TRANSPORT_LE,

                          false);

    }

  }



  return dis_gatt_c_read_dis_req(conn_id);

}

system/stack/srvc/srvc_dis_int.h

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#ifndef SRVC_DIS_INT_H

#define SRVC_DIS_INT_H



#include <queue>



#include "gatt_api.h"

#include "internal_include/bt_target.h"

#include "srvc_api.h"
@@ -27,10 +29,17 @@ 
#define DIS_SYSTEM_ID_SIZE 8

#define DIS_PNP_ID_SIZE 7



typedef struct {

  tDIS_READ_CBACK* p_read_dis_cback;

  tDIS_ATTR_MASK mask;

  RawAddress addr;

} tDIS_REQ;



typedef struct {

  tDIS_READ_CBACK* p_read_dis_cback;

  uint8_t dis_read_uuid_idx;

  tDIS_ATTR_MASK request_mask;

  std::queue<tDIS_REQ> pend_reqs;

} tDIS_CB;



/* Global GATT data */