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

Commit 727302f7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "btm/iso: Set connecting state while issuing establish cis" am: ccee5732 

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

Change-Id: I36ddeb781d8e30ada0275ba6c24deaacea2f4c93
parents df847068 ccee5732

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