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

Commit fb941e1a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "gd: Prevent erroneous fail connection on acceptlist change" am: 56703993 am: 314454cb 

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

Change-Id: Ie76ec97bd9482ca83e139931c027c6fb16d08d21
parents 7c035cbd 314454cb

system/gd/hci/acl_manager/le_impl.h

+2 −4
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    AddressWithType remote_address(address, peer_address_type);

    AddressWithType local_address = le_address_manager_->GetCurrentAddress();

    on_common_le_connection_complete(remote_address);

    if (status == ErrorCode::UNKNOWN_CONNECTION &&

        canceled_connections_.find(remote_address) != canceled_connections_.end()) {

    if (status == ErrorCode::UNKNOWN_CONNECTION && pause_connection) {

      // connection canceled by LeAddressManager.OnPause(), will auto reconnect by LeAddressManager.OnResume()

      return;

    } else {
@@ -210,8 +209,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
      remote_address = AddressWithType(peer_resolvable_address, AddressType::RANDOM_DEVICE_ADDRESS);

    }

    on_common_le_connection_complete(remote_address);

    if (status == ErrorCode::UNKNOWN_CONNECTION &&

        canceled_connections_.find(remote_address) != canceled_connections_.end()) {

    if (status == ErrorCode::UNKNOWN_CONNECTION && pause_connection) {

      // connection canceled by LeAddressManager.OnPause(), will auto reconnect by LeAddressManager.OnResume()

      return;

    } else {