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

Commit 47bfc977 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "leaudio: Fix context available change while in codec configured" into main am: 33bc52f8 

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



Change-Id: I6d4c3782dc8d7239e5466fccdc7531697c6e838f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d29f7413 33bc52f8

system/bta/le_audio/client.cc

+1 −1
Original line number Diff line number Diff line
@@ -1874,7 +1874,7 @@ class LeAudioClientImpl : public LeAudioClient { 
        return;

      }



      if (group->IsReleasingOrIdle()) {

      if (!group->IsStreaming()) {

        /* Group is not streaming. Device does not have to be attach to the

         * stream, and we can update context availability for the group

         */

system/bta/le_audio/le_audio_client_test.cc

+76 −0
Original line number Diff line number Diff line
@@ -4572,6 +4572,82 @@ TEST_F(UnicastTest, HandleResumeWithoutMetadataUpdateOnLocalSink) { 
  Mock::VerifyAndClearExpectations(&mock_state_machine_);

}



TEST_F(UnicastTest, ChangeAvailableContextTypeWhenInCodecConfigured) {

  const RawAddress test_address0 = GetTestAddress(0);

  int group_id = bluetooth::groups::kGroupUnknown;



  /**

   * In this test we want to make sure that Available context change reach Java

   * when group is in Configured state

   */



  default_channel_cnt = 1;



  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);



  // 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);

  SyncOnMainLoop();



  EXPECT_CALL(mock_state_machine_, StartStream(_, _, _, _)).Times(1);



  UpdateLocalSinkMetadata(AUDIO_SOURCE_MIC);

  LocalAudioSinkResume();



  SyncOnMainLoop();

  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

  Mock::VerifyAndClearExpectations(&mock_le_audio_source_hal_client_);

  Mock::VerifyAndClearExpectations(&mock_state_machine_);



  // Verify Data transfer on local audio sink which is started

  constexpr uint8_t cis_count_out = 0;

  constexpr uint8_t cis_count_in = 1;

  TestAudioDataTransfer(group_id, cis_count_out, cis_count_in, 0, 40);



  // Remember group to set the state after stopping the stream

  auto group = streaming_groups.at(group_id);



  SyncOnMainLoop();

  StopStreaming(group_id, true);

  SyncOnMainLoop();



  // simulate suspend timeout passed, alarm executing

  fake_osi_alarm_set_on_mloop_.cb(fake_osi_alarm_set_on_mloop_.data);

  SyncOnMainLoop();



  // Simulate state Configured

  group->SetState(types::AseState::BTA_LE_AUDIO_ASE_STATE_CODEC_CONFIGURED);



  EXPECT_CALL(mock_audio_hal_client_callbacks_, OnAudioConf(_, _, _, _, _));



  /* Check if available context will be sent to Java */

  auto sink_available_context = types::kLeAudioContextAllRemoteSinkOnly;

  auto source_available_context = types::kLeAudioContextAllRemoteSource;



  InjectAvailableContextTypes(test_address0, 1, sink_available_context,

                              source_available_context);



  SyncOnMainLoop();

  Mock::VerifyAndClearExpectations(&mock_audio_hal_client_callbacks_);

}



TEST_F(UnicastTest, RemoveNodeWhileStreaming) {

  const RawAddress test_address0 = GetTestAddress(0);

  int group_id = bluetooth::groups::kGroupUnknown;