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

Commit ce154567 authored by Chen Chen's avatar Chen Chen Committed by Automerger Merge Worker
Browse files

Updated SIG wording: whitelist to acceptlist am: 48dcbb0a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/12840375

Change-Id: I8bb7d6b1fa319bef1d3460a4663c938da4ef11db
parents 8639ab9c 48dcbb0a

system/bta/dm/bta_dm_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { 
      if (peer_device.peer_bdaddr == bd_addr) {

        peer_device.conn_state = BTA_DM_UNPAIRING;



        /* Make sure device is not in white list before we disconnect */

        /* Make sure device is not in acceptlist before we disconnect */

        GATT_CancelConnect(0, bd_addr, false);



        btm_remove_acl(bd_addr, peer_device.transport);
@@ -610,7 +610,7 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { 
      if (peer_device.peer_bdaddr == other_address) {

        peer_device.conn_state = BTA_DM_UNPAIRING;



        /* Make sure device is not in white list before we disconnect */

        /* Make sure device is not in acceptlist before we disconnect */

        GATT_CancelConnect(0, bd_addr, false);



        btm_remove_acl(other_address, peer_device.transport);
@@ -681,7 +681,7 @@ void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev, 
      APPL_TRACE_ERROR("unknown device, remove ACL failed");

    }



    /* Make sure device is not in white list before we disconnect */

    /* Make sure device is not in acceptlist before we disconnect */

    GATT_CancelConnect(0, bd_addr, false);



    /* Disconnect the ACL link */

system/bta/gatt/bta_gattc_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ void bta_gattc_deregister(tBTA_GATTC_RCB* p_clreg) { 
  }



  /* remove bg connection associated with this rcb */

  for (uint8_t i = 0; i < BTM_GetWhiteListSize(); i++) {

  for (uint8_t i = 0; i < BTM_GetAcceptlistSize(); i++) {

    if (!bta_gattc_cb.bg_track[i].in_use) continue;



    if (bta_gattc_cb.bg_track[i].cif_mask & (1 << (p_clreg->client_if - 1))) {

system/bta/gatt/bta_gattc_utils.cc

+6 −6
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ tBTA_GATTC_SERV* bta_gattc_find_srcb(const RawAddress& bda) { 
  tBTA_GATTC_SERV* p_srcb = &bta_gattc_cb.known_server[0];

  uint8_t i;



  for (i = 0; i < BTM_GetWhiteListSize(); i++, p_srcb++) {

  for (i = 0; i < BTM_GetAcceptlistSize(); i++, p_srcb++) {

    if (p_srcb->in_use && p_srcb->server_bda == bda) return p_srcb;

  }

  return NULL;
@@ -244,7 +244,7 @@ tBTA_GATTC_SERV* bta_gattc_find_srvr_cache(const RawAddress& bda) { 
  tBTA_GATTC_SERV* p_srcb = &bta_gattc_cb.known_server[0];

  uint8_t i;



  for (i = 0; i < BTM_GetWhiteListSize(); i++, p_srcb++) {

  for (i = 0; i < BTM_GetAcceptlistSize(); i++, p_srcb++) {

    if (p_srcb->server_bda == bda) return p_srcb;

  }

  return NULL;
@@ -280,7 +280,7 @@ tBTA_GATTC_SERV* bta_gattc_srcb_alloc(const RawAddress& bda) { 
  bool found = false;

  uint8_t i;



  for (i = 0; i < BTM_GetWhiteListSize(); i++, p_tcb++) {

  for (i = 0; i < BTM_GetAcceptlistSize(); i++, p_tcb++) {

    if (!p_tcb->in_use) {

      found = true;

      break;
@@ -410,7 +410,7 @@ bool bta_gattc_mark_bg_conn(tGATT_IF client_if, 
  uint8_t i = 0;

  tBTA_GATTC_CIF_MASK* p_cif_mask;



  for (i = 0; i < BTM_GetWhiteListSize(); i++, p_bg_tck++) {

  for (i = 0; i < BTM_GetAcceptlistSize(); i++, p_bg_tck++) {

    if (p_bg_tck->in_use && ((p_bg_tck->remote_bda == remote_bda_ptr) ||

                             (p_bg_tck->remote_bda.IsEmpty()))) {

      p_cif_mask = &p_bg_tck->cif_mask;
@@ -438,7 +438,7 @@ bool bta_gattc_mark_bg_conn(tGATT_IF client_if, 
  } else /* adding a new device mask */

  {

    for (i = 0, p_bg_tck = &bta_gattc_cb.bg_track[0];

         i < BTM_GetWhiteListSize(); i++, p_bg_tck++) {

         i < BTM_GetAcceptlistSize(); i++, p_bg_tck++) {

      if (!p_bg_tck->in_use) {

        p_bg_tck->in_use = true;

        p_bg_tck->remote_bda = remote_bda_ptr;
@@ -469,7 +469,7 @@ bool bta_gattc_check_bg_conn(tGATT_IF client_if, const RawAddress& remote_bda, 
  uint8_t i = 0;

  bool is_bg_conn = false;



  for (i = 0; i < BTM_GetWhiteListSize() && !is_bg_conn; i++, p_bg_tck++) {

  for (i = 0; i < BTM_GetAcceptlistSize() && !is_bg_conn; i++, p_bg_tck++) {

    if (p_bg_tck->in_use && (p_bg_tck->remote_bda == remote_bda ||

                             p_bg_tck->remote_bda.IsEmpty())) {

      if (((p_bg_tck->cif_mask & (1 << (client_if - 1))) != 0) &&

system/bta/hearing_aid/hearing_aid.cc

+8 −8
Original line number Diff line number Diff line
@@ -317,17 +317,17 @@ class HearingAidImpl : public HearingAid { 
    BTA_GATTC_Open(gatt_if, address, true, BT_TRANSPORT_LE, false);

  }



  void AddToWhiteList(const RawAddress& address) override {

  void AddToAcceptlist(const RawAddress& address) override {

    VLOG(2) << __func__ << " address: " << address;

    hearingDevices.Add(HearingDevice(address, true));

    BTA_GATTC_Open(gatt_if, address, false, BT_TRANSPORT_LE, false);

  }



  void AddFromStorage(const HearingDevice& dev_info, uint16_t is_white_listed) {

  void AddFromStorage(const HearingDevice& dev_info, uint16_t is_acceptlisted) {

    DVLOG(2) << __func__ << " " << dev_info.address

             << ", hiSyncId=" << loghex(dev_info.hi_sync_id)

             << ", isWhiteListed=" << is_white_listed;

    if (is_white_listed) {

             << ", isAcceptlisted=" << is_acceptlisted;

    if (is_acceptlisted) {

      hearingDevices.Add(dev_info);



      // TODO: we should increase the scanning window for few seconds, to get
@@ -361,7 +361,7 @@ class HearingAidImpl : public HearingAid { 


    if (status != GATT_SUCCESS) {

      if (!hearingDevice->connecting_actively) {

        // whitelist connection failed, that's ok.

        // acceptlist connection failed, that's ok.

        return;

      }
@@ -1487,7 +1487,7 @@ class HearingAidImpl : public HearingAid { 
    DoDisconnectCleanUp(hearingDevice);



    // This is needed just for the first connection. After stack is restarted,

    // code that loads device will add them to whitelist.

    // code that loads device will add them to acceptlist.

    BTA_GATTC_Open(gatt_if, hearingDevice->address, false, BT_TRANSPORT_LE,

                   false);
@@ -1780,12 +1780,12 @@ HearingAid* HearingAid::Get() { 
};



void HearingAid::AddFromStorage(const HearingDevice& dev_info,

                                uint16_t is_white_listed) {

                                uint16_t is_acceptlisted) {

  if (!instance) {

    LOG(ERROR) << "Not initialized yet";

  }



  instance->AddFromStorage(dev_info, is_white_listed);

  instance->AddFromStorage(dev_info, is_acceptlisted);

};



int HearingAid::GetDeviceCount() {

system/bta/include/bta_hearing_aid_api.h

+2 −2
Original line number Diff line number Diff line
@@ -218,13 +218,13 @@ class HearingAid { 
  static void DebugDump(int fd);



  static void AddFromStorage(const HearingDevice& dev_info,

                             uint16_t is_white_listed);

                             uint16_t is_acceptlisted);



  static int GetDeviceCount();



  virtual void Connect(const RawAddress& address) = 0;

  virtual void Disconnect(const RawAddress& address) = 0;

  virtual void AddToWhiteList(const RawAddress& address) = 0;

  virtual void AddToAcceptlist(const RawAddress& address) = 0;

  virtual void SetVolume(int8_t volume) = 0;

};