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

Commit 08b0f534 authored by Jack He's avatar Jack He Committed by Android (Google) Code Review
Browse files

Merge changes I2cdaa240,Ie2fb572a into tm-dev 

* changes:
  LeAclManager: Arm connectability on resume
  Fix gatt autoconnect
parents a55665d3 60fd1237

system/gd/hci/acl_manager/le_impl.h

+2 −4
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
  // connection canceled by LeAddressManager.OnPause(), will auto reconnect by LeAddressManager.OnResume()

  void on_le_connection_canceled_on_pause() {

    ASSERT_LOG(pause_connection, "Connection must be paused to ack the le address manager");

    arm_on_resume_ = true;

    connectability_state_ = ConnectabilityState::DISARMED;

    le_address_manager_->AckPause(this);

  }
@@ -464,12 +465,9 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 


    if (background_connections_.count(remote_address) == 1) {

      LOG_INFO("re-add device to connect list");

      arm_on_resume_ = true;

      add_device_to_connect_list(remote_address);

    }

    if (!connect_list.empty() && connectability_state_ == ConnectabilityState::DISARMED) {

      LOG_INFO("connect_list is not empty, send a new connection request");

      arm_connectability();

    }

  }



  void on_le_connection_update_complete(LeMetaEventView view) {

system/stack/acl/ble_acl.cc

+1 −6
Original line number Diff line number Diff line
@@ -125,12 +125,7 @@ void acl_ble_enhanced_connection_complete_from_shim( 
    uint16_t conn_interval, uint16_t conn_latency, uint16_t conn_timeout,

    const RawAddress& local_rpa, const RawAddress& peer_rpa,

    tBLE_ADDR_TYPE peer_addr_type) {

  if (!connection_manager::remove_unconditional_from_shim(

          address_with_type.bda)) {

    LOG_WARN(

        "Unable to remove from legacy connection manager accept list addr:%s",

        PRIVATE_ADDRESS(address_with_type.bda));

  }

  connection_manager::on_connection_complete(address_with_type.bda);



  tBLE_BD_ADDR resolved_address_with_type;

  const bool is_in_security_db = maybe_resolve_received_address(

system/stack/gatt/connection_manager.cc

+0 −15
Original line number Diff line number Diff line
@@ -149,21 +149,6 @@ bool remove_unconditional(const RawAddress& address) { 
  return true;

}



/** Removes the registrations for connection for given device.

 * but does not change the controller acceptlist.  Used for

 * shim purposes.

 * Returns true if anything was removed, false otherwise */

bool remove_unconditional_from_shim(const RawAddress& address) {

  LOG_DEBUG("address=%s", address.ToString().c_str());

  auto it = bgconn_dev.find(address);

  if (it == bgconn_dev.end()) {

    LOG_WARN("address %s is not found", address.ToString().c_str());

    return false;

  }

  bgconn_dev.erase(it);

  return true;

}



/** Remove device from the background connection device list or listening to

 * advertising list.  Returns true if device was on the list and was

 * successfully removed */

system/stack/gatt/connection_manager.h

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ extern bool background_connect_add(tAPP_ID app_id, const RawAddress& address); 
extern bool background_connect_remove(tAPP_ID app_id,

                                      const RawAddress& address);

extern bool remove_unconditional(const RawAddress& address);

extern bool remove_unconditional_from_shim(const RawAddress& address);



extern void reset(bool after_reset);

system/test/mock/mock_stack_gatt_connection_manager.cc

+0 −5
Original line number Diff line number Diff line
@@ -71,11 +71,6 @@ bool connection_manager::remove_unconditional(const RawAddress& address) { 
  mock_function_count_map[__func__]++;

  return false;

}

bool connection_manager::remove_unconditional_from_shim(

    const RawAddress& address) {

  mock_function_count_map[__func__]++;

  return false;

}

std::set<tAPP_ID> connection_manager::get_apps_connecting_to(

    const RawAddress& address) {

  mock_function_count_map[__func__]++;