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

Commit f290b34a authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Automerger Merge Worker
Browse files

Merge "LeAudio: Fix broadcast cleanup issue" into main am: f7d60a26 am: d6ba8c6c 

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



Change-Id: I9ac311ea690c9a620c4ef773226b7ff499b344ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9721d144 d6ba8c6c

system/bta/le_audio/broadcaster/broadcaster.cc

+2 −4
Original line number Diff line number Diff line
@@ -141,10 +141,8 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 


    if (le_audio_source_hal_client_) {

      le_audio_source_hal_client_->Stop();

      auto result =

      CodecManager::GetInstance()->UpdateActiveBroadcastAudioHalClient(

          le_audio_source_hal_client_.get(), false);

      log::assert_that(result, "Could not update session in codec manager");

      le_audio_source_hal_client_.reset();

    }

  }

system/bta/le_audio/broadcaster/broadcaster_test.cc

+8 −0
Original line number Diff line number Diff line
@@ -439,6 +439,14 @@ TEST_F(BroadcasterTest, Initialize) { 
  ASSERT_TRUE(LeAudioBroadcaster::IsLeAudioBroadcasterRunning());

}



TEST_F(BroadcasterTest, CleanupWithBroadcastInstance) {

  auto broadcast_id = InstantiateBroadcast();

  ASSERT_NE(broadcast_id, LeAudioBroadcaster::kInstanceIdUndefined);

  EXPECT_CALL(*mock_codec_manager_,

              UpdateActiveBroadcastAudioHalClient(mock_audio_source_, false))

      .WillOnce(Return(false));

}



TEST_F(BroadcasterTest, GetStreamingPhy) {

  LeAudioBroadcaster::Get()->SetStreamingPhy(1);

  ASSERT_EQ(LeAudioBroadcaster::Get()->GetStreamingPhy(), 1);