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

Commit a3fa04c0 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "btm_iso: Remove assert on CIS data path created" am: c120a5d5 am:... 

Merge "btm_iso: Remove assert on CIS data path created" am: c120a5d5 am: 0fdc29f1 am: 3e31414d am: 0db99905

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



Change-Id: I7e412bf1023b8e5736fdaa60131f37ef35af60cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a18bd27 0db99905

system/stack/btm/btm_iso_impl.h

+5 −2
Original line number Diff line number Diff line
@@ -440,8 +440,11 @@ struct iso_impl { 
        return;

      }

    }

    LOG_ASSERT(iso->state_flags & kStateFlagHasDataPathSet)

        << "Data path not set for handle: " << loghex(iso_handle);



    if (!(iso->state_flags & kStateFlagHasDataPathSet)) {

      LOG_WARN("Data path not set for handle: 0x%04x", iso_handle);

      return;

    }



    /* Calculate sequence number for the ISO data packet.

     * It should be incremented by 1 every SDU Interval.

system/stack/test/btm_iso_test.cc

+6 −8
Original line number Diff line number Diff line
@@ -2125,20 +2125,18 @@ TEST_F(IsoManagerDeathTest, SendIsoDataWithNoDataPath) { 
  IsoManager::GetInstance()->EstablishCis(params);



  EXPECT_CALL(bte_interface_, HciSend).Times(0);

  ASSERT_EXIT(IsoManager::GetInstance()->SendIsoData(

                  volatile_test_cig_create_cmpl_evt_.conn_handles[0],

                  data_vec.data(), data_vec.size()),

              ::testing::KilledBySignal(SIGABRT), "Data path not set");

  IsoManager::GetInstance()->SendIsoData(

      volatile_test_cig_create_cmpl_evt_.conn_handles[0], data_vec.data(),

      data_vec.size());



  // Check on BIG

  IsoManager::GetInstance()->CreateBig(volatile_test_big_params_evt_.big_id,

                                       kDefaultBigParams);



  EXPECT_CALL(bte_interface_, HciSend).Times(0);

  ASSERT_EXIT(IsoManager::GetInstance()->SendIsoData(

                  volatile_test_big_params_evt_.conn_handles[0],

                  data_vec.data(), data_vec.size()),

              ::testing::KilledBySignal(SIGABRT), "Data path not set");

  IsoManager::GetInstance()->SendIsoData(

      volatile_test_big_params_evt_.conn_handles[0], data_vec.data(),

      data_vec.size());

}



TEST_F(IsoManagerDeathTest, SendIsoDataWithNoCigBigHandle) {