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

Commit ab22f45f authored by Grzegorz Kołodziejczyk's avatar Grzegorz Kołodziejczyk
Browse files

btm/iso: Set connecting state while issuing establish cis 

This patch sets state to connecting while trying to establish CIS. It
is possible to call command which touches CIS for which even command
status did not came. Without this it may lead to assert "Assert failed:
cis->state_flags & kStateFlagIsConnected || cis->state_flags &
kStateFlagIsConnecting. Not connected".

Bug: 208912945
Tag: #feature
Sponsor: jpawlowski@
test: atest --host  net_test_btm_iso
Change-Id: I5fdf94e51d5a638437ddbb64c92b2ccc41f82cbe
parent b3849d0e

system/stack/btm/btm_iso_impl.h

+8 −6
Original line number Diff line number Diff line
@@ -199,14 +199,14 @@ struct iso_impl { 
    for (auto cis_param : conn_params.conn_pairs) {

      cis_establish_cmpl_evt evt;



      if (status == HCI_SUCCESS) {

        /* Set connecting flag and wait for connection established event */

      if (status != HCI_SUCCESS) {

        auto cis = GetCisIfKnown(cis_param.cis_conn_handle);

        cis->state_flags |= kStateFlagIsConnecting;

      } else {

        LOG_ASSERT(cis != nullptr) << "No such cis";



        evt.status = status;

        evt.cis_conn_hdl = cis_param.cis_conn_handle;

        evt.cig_id = 0xFF;

        cis->state_flags &= ~kStateFlagIsConnecting;

        cig_callbacks_->OnCisEvent(kIsoEventCisEstablishCmpl, &evt);

      }

    }
@@ -216,8 +216,10 @@ struct iso_impl { 
    for (auto& el : conn_params.conn_pairs) {

      auto cis = GetCisIfKnown(el.cis_conn_handle);

      LOG_ASSERT(cis) << "No such cis";

      LOG_ASSERT(!(cis->state_flags & kStateFlagIsConnected))

          << "Already connected";

      LOG_ASSERT(!(cis->state_flags &

                   (kStateFlagIsConnected | kStateFlagIsConnecting)))

          << "Already connected or connecting";

      cis->state_flags |= kStateFlagIsConnecting;

    }

    btsnd_hcic_create_cis(conn_params.conn_pairs.size(),

                          conn_params.conn_pairs.data(),

system/stack/test/btm_iso_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ TEST_F(IsoManagerDeathTest, ConnectSameCisTwice) { 
  ASSERT_EXIT(

      IsoManager::GetInstance()->IsoManager::GetInstance()->EstablishCis(

          params),

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

      ::testing::KilledBySignal(SIGABRT), "Already connected or connecting");

}



TEST_F(IsoManagerDeathTest, EstablishCisInvalidResponsePacket) {