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

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

Merge "le_impl: Transition to ARMING state before sending create connection"... 

Merge "le_impl: Transition to ARMING state before sending create connection" am: 6afffa12 am: af896838 am: e3400d09 am: 97a38d00

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



Change-Id: Ie3937efad794888d93828b1988961c54085a0098
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7fc06941 97a38d00

system/gd/hci/acl_manager/le_impl.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -591,9 +591,9 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
  }

  }





  void disarm_connectability() {

  void disarm_connectability() {

    if (connectability_state_ != ConnectabilityState::ARMED) {

    if (connectability_state_ != ConnectabilityState::ARMED && connectability_state_ != ConnectabilityState::ARMING) {

      LOG_ERROR(

      LOG_ERROR(

          "Attempting to re-arm le connection state machine in unexpected state:%s",

          "Attempting to disarm le connection state machine in unexpected state:%s",

          connectability_state_machine_text(connectability_state_).c_str());

          connectability_state_machine_text(connectability_state_).c_str());

      return;

      return;

    }

    }
@@ -669,6 +669,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    ASSERT(check_connection_parameters(conn_interval_min, conn_interval_max, conn_latency, supervision_timeout));

    ASSERT(check_connection_parameters(conn_interval_min, conn_interval_max, conn_latency, supervision_timeout));





    connecting_le_.insert(address_with_type);

    connecting_le_.insert(address_with_type);

    connectability_state_ = ConnectabilityState::ARMING;





    if (initiator_filter_policy == InitiatorFilterPolicy::USE_CONNECT_LIST) {

    if (initiator_filter_policy == InitiatorFilterPolicy::USE_CONNECT_LIST) {

      address_with_type = AddressWithType();

      address_with_type = AddressWithType();