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

Commit 5d5eee67 authored by Jakub Tyszkowski's avatar Jakub Tyszkowski
Browse files

LeAudio: Fix not clearing the audio session metadata 

This could lead to configuring to some old scenario.

Bug: 285647765
Test: atest bluetooth_le_audio_client_test
Change-Id: Id311bae14b9380cc122cc67f3fb60276c651efba
parent 9ee9098a

system/bta/le_audio/client.cc

+7 −3
Original line number Diff line number Diff line
@@ -1181,7 +1181,7 @@ class LeAudioClientImpl : public LeAudioClient { 
      if (alarm_is_scheduled(suspend_timeout_)) alarm_cancel(suspend_timeout_);



      StopAudio();

      ClientAudioIntefraceRelease();

      ClientAudioInterfaceRelease();



      GroupStop(group_id_to_close);

      callbacks_->OnGroupStatus(group_id_to_close, GroupStatus::INACTIVE);
@@ -3708,7 +3708,7 @@ class LeAudioClientImpl : public LeAudioClient { 
    if (active_group_id_ != bluetooth::groups::kGroupUnknown) {

      /* Bluetooth turned off while streaming */

      StopAudio();

      ClientAudioIntefraceRelease();

      ClientAudioInterfaceRelease();

    }

    groupStateMachine_->Cleanup();

    aseGroups_.Cleanup();
@@ -5453,16 +5453,20 @@ class LeAudioClientImpl : public LeAudioClient { 


  base::WeakPtrFactory<LeAudioClientImpl> weak_factory_{this};



  void ClientAudioIntefraceRelease() {

  void ClientAudioInterfaceRelease() {

    if (le_audio_source_hal_client_) {

      le_audio_source_hal_client_->Stop();

      le_audio_source_hal_client_.reset();

    }

    metadata_context_types_.sink.clear();



    if (le_audio_sink_hal_client_) {

      le_audio_sink_hal_client_->Stop();

      le_audio_sink_hal_client_.reset();

    }

    metadata_context_types_.source.clear();

    configuration_context_type_ = LeAudioContextType::UNINITIALIZED;



    le_audio::MetricsCollector::Get()->OnStreamEnded(active_group_id_);

  }

};

system/bta/le_audio/le_audio_client_test.cc

+79 −0
Original line number Diff line number Diff line
@@ -4314,6 +4314,85 @@ TEST_F(UnicastTest, SpeakerStreaming) { 
  Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);

}



TEST_F(UnicastTest, SpeakerStreamingNonDefault) {

  const RawAddress test_address0 = GetTestAddress(0);

  int group_id = bluetooth::groups::kGroupUnknown;



  available_snk_context_types_ = (types::LeAudioContextType::VOICEASSISTANTS |

                                  types::LeAudioContextType::MEDIA)

                                     .value();

  supported_snk_context_types_ = available_snk_context_types_;



  SetSampleDatabaseEarbudsValid(

      1, test_address0, codec_spec_conf::kLeAudioLocationStereo,

      codec_spec_conf::kLeAudioLocationStereo, default_channel_cnt,

      default_channel_cnt, 0x0004,

      /* source sample freq 16khz */ false /*add_csis*/, true /*add_cas*/,

      true /*add_pacs*/, default_ase_cnt /*add_ascs_cnt*/, 1 /*set_size*/,

      0 /*rank*/);

  EXPECT_CALL(mock_audio_hal_client_callbacks_,

              OnConnectionState(ConnectionState::CONNECTED, test_address0))

      .Times(1);

  EXPECT_CALL(mock_audio_hal_client_callbacks_,

              OnGroupNodeStatus(test_address0, _, GroupNodeStatus::ADDED))

      .WillOnce(DoAll(SaveArg<1>(&group_id)));



  ConnectLeAudio(test_address0);

  ASSERT_NE(group_id, bluetooth::groups::kGroupUnknown);



  // Start streaming

  uint8_t cis_count_out = 1;

  uint8_t cis_count_in = 0;



  // Audio sessions are started only when device gets active

  EXPECT_CALL(*mock_le_audio_source_hal_client_, Start(_, _)).Times(1);

  EXPECT_CALL(*mock_le_audio_sink_hal_client_, Start(_, _)).Times(1);

  LeAudioClient::Get()->GroupSetActive(group_id);



  StartStreaming(AUDIO_USAGE_ASSISTANT, AUDIO_CONTENT_TYPE_UNKNOWN, group_id);



  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

  Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);

  SyncOnMainLoop();



  // Verify Data transfer on one audio source cis

  TestAudioDataTransfer(group_id, cis_count_out, cis_count_in, 1920);



  // Suspend

  /*TODO Need a way to verify STOP */

  LeAudioClient::Get()->GroupSuspend(group_id);

  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

  Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);



  // Resume

  StartStreaming(AUDIO_USAGE_ASSISTANT, AUDIO_CONTENT_TYPE_UNKNOWN, group_id);

  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

  Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);



  // Stop

  StopStreaming(group_id);

  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);



  // Release

  EXPECT_CALL(*mock_le_audio_source_hal_client_, Stop()).Times(1);

  EXPECT_CALL(*mock_le_audio_source_hal_client_, OnDestroyed()).Times(1);

  EXPECT_CALL(*mock_le_audio_sink_hal_client_, OnDestroyed()).Times(1);

  LeAudioClient::Get()->GroupSetActive(bluetooth::groups::kGroupUnknown);

  Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);



  /* When session is closed, the hal client mocks are freed - get new ones */

  SetUpMockAudioHal();

  /* Expect the previous release to clear the old audio session metadata */

  auto default_impl_context = types::LeAudioContextType::MEDIA;

  LeAudioClient::Get()->GroupSetActive(group_id);

  EXPECT_CALL(mock_state_machine_,

              StartStream(_, types::LeAudioContextType::VOICEASSISTANTS, _, _))

      .Times(0);

  EXPECT_CALL(mock_state_machine_, StartStream(_, default_impl_context, _, _))

      .Times(1);

  LocalAudioSourceResume();

}



TEST_F(UnicastTest, SpeakerStreamingAutonomousRelease) {

  const RawAddress test_address0 = GetTestAddress(0);

  int group_id = bluetooth::groups::kGroupUnknown;