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

Commit 00a05d70 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "btm_iso: Fix cig id in the OnCisEvent callback" into main

parents 42eac094 c4ce7ecc

system/stack/btm/btm_iso_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ struct iso_impl { 


        evt.status = status;

        evt.cis_conn_hdl = cis_param.cis_conn_handle;

        evt.cig_id = 0xFF;

        evt.cig_id = cis->cig_id;

        cis->state_flags &= ~kStateFlagIsConnecting;

        cig_callbacks_->OnCisEvent(kIsoEventCisEstablishCmpl, &evt);

system/stack/test/btm_iso_test.cc

+5 −3
Original line number Diff line number Diff line
@@ -1124,8 +1124,8 @@ TEST_F(IsoManagerTest, EstablishCisInvalidCommandStatus) { 
}



TEST_F(IsoManagerTest, EstablishCisInvalidStatus) {

  IsoManager::GetInstance()->CreateCig(

      volatile_test_cig_create_cmpl_evt_.cig_id, kDefaultCigParams);

  uint8_t cig_id = volatile_test_cig_create_cmpl_evt_.cig_id;

  IsoManager::GetInstance()->CreateCig(cig_id, kDefaultCigParams);

  uint8_t invalid_status = 0x01;



  ON_CALL(hcic_interface_, CreateCis)
@@ -1163,12 +1163,14 @@ TEST_F(IsoManagerTest, EstablishCisInvalidStatus) { 
      *cig_callbacks_,

      OnCisEvent(bluetooth::hci::iso_manager::kIsoEventCisEstablishCmpl, _))

      .Times(kDefaultCigParams.cis_cfgs.size())

      .WillRepeatedly([this, invalid_status](uint8_t /* type */, void* data) {

      .WillRepeatedly([this, invalid_status, cig_id](uint8_t /* type */,

                                                     void* data) {

        bluetooth::hci::iso_manager::cis_establish_cmpl_evt* evt =

            static_cast<bluetooth::hci::iso_manager::cis_establish_cmpl_evt*>(

                data);



        ASSERT_EQ(evt->status, invalid_status);

        ASSERT_EQ(evt->cig_id, cig_id);

        ASSERT_TRUE(

            std::find(volatile_test_cig_create_cmpl_evt_.conn_handles.begin(),

                      volatile_test_cig_create_cmpl_evt_.conn_handles.end(),