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

Commit ff7a3be3 authored by Mariusz Skamra's avatar Mariusz Skamra
Browse files

bta: le_audio: Set connection state prior ProcessHciNotifAclDisconnected 

This fixes the connection state when ProcessHciNotifAclDisconnected is called.
The ProcessHciNotifAclDisconnected calls other functions that check the
connection state and may see the device as still connected.

Bug: 357472821
Flag: Exempt; change already covered in unit tests
Test: atest bluetooth_le_audio_client_test
Change-Id: I5d0c503643eb2e91c30b796e50068e461b1ad9c9
parent f15a9bf2

system/bta/le_audio/client.cc

+5 −4
Original line number Diff line number Diff line
@@ -2418,13 +2418,17 @@ public: 
    leAudioDevice->encrypted_ = false;

    leAudioDevice->acl_phy_update_done_ = false;



    auto connection_state = leAudioDevice->GetConnectionState();



    leAudioDevice->SetConnectionState(DeviceConnectState::DISCONNECTED);



    groupStateMachine_->ProcessHciNotifAclDisconnected(group, leAudioDevice);



    bluetooth::le_audio::MetricsCollector::Get()->OnConnectionStateChanged(

            leAudioDevice->group_id_, address, ConnectionState::DISCONNECTED,

            bluetooth::le_audio::ConnectionStatus::SUCCESS);



    if (leAudioDevice->GetConnectionState() == DeviceConnectState::REMOVING) {

    if (connection_state == DeviceConnectState::REMOVING) {

      if (leAudioDevice->group_id_ != bluetooth::groups::kGroupUnknown) {

        auto group = aseGroups_.FindById(leAudioDevice->group_id_);

        group_remove_node(group, address, true);
@@ -2433,7 +2437,6 @@ public: 
      return;

    }



    auto connection_state = leAudioDevice->GetConnectionState();

    log::info("{}, autoconnect {}, reason 0x{:02x}, connection state {}", leAudioDevice->address_,

              leAudioDevice->autoconnect_flag_, reason,

              bluetooth::common::ToString(connection_state));
@@ -2449,8 +2452,6 @@ public: 
      return;

    }



    leAudioDevice->SetConnectionState(DeviceConnectState::DISCONNECTED);



    /* Attempt background re-connect if disconnect was not initiated locally

     * or if autoconnect is set and device got disconnected because of some

     * issues