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

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

Merge "leaudio: Use assert when internal code is called incorrectly" into main... 

Merge "leaudio: Use assert when internal code is called incorrectly" into main am: 5e20eca5 am: b8c2d2f3 am: 128a2b3f

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



Change-Id: I8715771d6fb7ec3543817f16bc319e94c23e1e5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d3d8fe7 128a2b3f

system/bta/le_audio/le_audio_types.cc

+2 −6
Original line number Diff line number Diff line
@@ -659,9 +659,7 @@ std::string LeAudioLtvMap::ToString( 


const struct LeAudioCoreCodecConfig& LeAudioLtvMap::GetAsCoreCodecConfig()

    const {

  if (core_capabilities) {

    LOG_ERROR("LTVs were already parsed for capabilities!");

  }

  ASSERT_LOG(!core_capabilities, "LTVs were already parsed for capabilities!");



  if (!core_config) {

    core_config = LtvMapToCoreCodecConfig(*this);
@@ -671,9 +669,7 @@ const struct LeAudioCoreCodecConfig& LeAudioLtvMap::GetAsCoreCodecConfig() 


const struct LeAudioCoreCodecCapabilities&

LeAudioLtvMap::GetAsCoreCodecCapabilities() const {

  if (core_config) {

    LOG_ERROR("LTVs were already parsed for configurations!");

  }

  ASSERT_LOG(!core_config, "LTVs were already parsed for configurations!");



  if (!core_capabilities) {

    core_capabilities = LtvMapToCoreCodecCapabilities(*this);