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

Commit 409a6ce6 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

btm_iso: Allow to start ISO by many clients am: 23cfabb7 am: 0fb1c213 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1620999

Change-Id: I8e39c672d658511bcaa693fb17d805d17fd7f499
parents f8938eb5 0fb1c213

system/stack/btm/btm_iso.cc

+8 −2
Original line number Diff line number Diff line
@@ -128,9 +128,15 @@ void IsoManager::HandleHciEvent(uint8_t sub_code, uint8_t* params, 
    pimpl_->iso_impl_->on_iso_event(sub_code, params, length);

}



void IsoManager::Start() { pimpl_->Start(); }

void IsoManager::Start() {

  if (!pimpl_->IsRunning())

    pimpl_->Start();

}



void IsoManager::Stop() { pimpl_->Stop(); }

void IsoManager::Stop() {

  if (pimpl_->IsRunning())

    pimpl_->Stop();

}



IsoManager::~IsoManager() = default;

system/stack/test/btm_iso_test.cc

+0 −18
Original line number Diff line number Diff line
@@ -518,24 +518,6 @@ TEST_F(IsoManagerDeathTestNoInit, RegisterNullCigCallbacks) { 
  IsoManager::GetInstance()->Stop();

}



TEST_F(IsoManagerDeathTestNoInit, DoubleStart) {

  IsoManager::GetInstance()->Start();



  ASSERT_EXIT(IsoManager::GetInstance()->Start(),

              ::testing::KilledBySignal(SIGABRT), "");



  // Manual cleanup as IsoManagerDeathTest has no 'generic' cleanup

  IsoManager::GetInstance()->Stop();

}



TEST_F(IsoManagerDeathTestNoInit, DoubleStop) {

  IsoManager::GetInstance()->Start();

  IsoManager::GetInstance()->Stop();



  ASSERT_EXIT(IsoManager::GetInstance()->Stop(),

              ::testing::KilledBySignal(SIGABRT), "");

}



// Verify hci layer being called by the Iso Manager

TEST_F(IsoManagerTest, CreateCigHciCall) {

  for (uint8_t i = 220; i != 60; ++i) {