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

Commit fee1f1af authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "LeAclManager: Arm connectability on resume" am: da9bfe44 am: 6a99fdce am: 3c8fdba8 

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



Change-Id: I59b96bc39626f01e1f5f545cda9e38a6edc8ff75
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ef0aa69 3c8fdba8

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) {