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

Commit 6db3541a authored by Łukasz Rymanowski's avatar Łukasz Rymanowski
Browse files

le_impl: Add better logs for changing state

Bug: 356594223
Flag: EXEMPT, mechanical refactor, no functionality change
Test: atest bluetooth_gd_unit_test

Change-Id: I78adee2484025509031baf487e82f5b5fb0c5f02
parent 48207b0f
Loading
Loading
Loading
Loading
+12 −6
Original line number Diff line number Diff line
@@ -321,12 +321,18 @@ public:
    }
  }

  void set_connectability_state(ConnectabilityState state) {
    log::debug("{} --> {}", connectability_state_machine_text(connectability_state_),
               connectability_state_machine_text(state));
    connectability_state_ = state;
  }

  // connection canceled by LeAddressManager.OnPause(), will auto reconnect by
  // LeAddressManager.OnResume()
  void on_le_connection_canceled_on_pause() {
    log::assert_that(pause_connection, "Connection must be paused to ack the le address manager");
    arm_on_resume_ = true;
    connectability_state_ = ConnectabilityState::DISARMED;
    set_connectability_state(ConnectabilityState::DISARMED);
    le_address_manager_->AckPause(this);
  }

@@ -394,7 +400,7 @@ public:
    const bool in_filter_accept_list = is_device_in_accept_list(remote_address);

    if (role == hci::Role::CENTRAL) {
      connectability_state_ = ConnectabilityState::DISARMED;
      set_connectability_state(ConnectabilityState::DISARMED);
      if (status == ErrorCode::UNKNOWN_CONNECTION && pause_connection) {
        on_le_connection_canceled_on_pause();
        return;
@@ -752,8 +758,8 @@ public:
        if (status != ErrorCode::SUCCESS) {
          log::error("Le connection state machine armed failed status:{}", ErrorCodeText(status));
        }
        connectability_state_ = (status == ErrorCode::SUCCESS) ? ConnectabilityState::ARMED
                                                               : ConnectabilityState::DISARMED;
        set_connectability_state((status == ErrorCode::SUCCESS) ? ConnectabilityState::ARMED
                                                                : ConnectabilityState::DISARMED);
        log::info("Le connection state machine armed state:{} status:{}",
                  connectability_state_machine_text(connectability_state_), ErrorCodeText(status));
        if (disarmed_while_arming_) {
@@ -791,7 +797,7 @@ public:
      return;
    }
    AddressWithType empty(Address::kEmpty, AddressType::RANDOM_DEVICE_ADDRESS);
    connectability_state_ = ConnectabilityState::ARMING;
    set_connectability_state(ConnectabilityState::ARMING);
    connecting_le_ = accept_list;

    uint16_t le_scan_interval =
@@ -905,7 +911,7 @@ public:
    switch (connectability_state_) {
      case ConnectabilityState::ARMED:
        log::info("Disarming LE connection state machine with create connection cancel");
        connectability_state_ = ConnectabilityState::DISARMING;
        set_connectability_state(ConnectabilityState::DISARMING);
        le_acl_connection_interface_->EnqueueCommand(
                LeCreateConnectionCancelBuilder::Create(),
                handler_->BindOnce(&le_impl::on_create_connection_cancel_complete,