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

Commit 4bf1190a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "leaudio: Fix removing data path" into main

parents 98d38d11 63f52f43

system/bta/le_audio/state_machine.cc

+2 −1
Original line number Diff line number Diff line
@@ -965,9 +965,10 @@ class LeAudioGroupStateMachineImpl : public LeAudioGroupStateMachine { 
      ases_pair.source->cis_state = CisState::ASSIGNED;

    }



    RemoveDataPathByCisHandle(leAudioDevice, event->cis_conn_hdl);



    /* If this is peer disconnecting CIS, make sure to clear data path */

    if (event->reason != HCI_ERR_CONN_CAUSE_LOCAL_HOST) {

      RemoveDataPathByCisHandle(leAudioDevice, event->cis_conn_hdl);

      // Make sure we won't stay in STREAMING state

      if (ases_pair.sink &&

          ases_pair.sink->state == AseState::BTA_LE_AUDIO_ASE_STATE_STREAMING) {

system/bta/le_audio/state_machine_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -5516,7 +5516,7 @@ TEST_F(StateMachineTest, StreamReconfigureAfterCisLostTwoDevices) { 
  EXPECT_CALL(*mock_iso_manager_, CreateCig(_, _)).Times(2);

  EXPECT_CALL(*mock_iso_manager_, EstablishCis(_)).Times(2);

  EXPECT_CALL(*mock_iso_manager_, SetupIsoDataPath(_, _)).Times(6);

  EXPECT_CALL(*mock_iso_manager_, RemoveIsoDataPath(_, _)).Times(0);

  EXPECT_CALL(*mock_iso_manager_, RemoveIsoDataPath(_, _)).Times(2);

  EXPECT_CALL(*mock_iso_manager_, DisconnectCis(_, _)).Times(0);

  EXPECT_CALL(*mock_iso_manager_, RemoveCig(_, _)).Times(1);