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

Commit bdd295d1 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "[resolved conflict] Merge "Fix 2 OOB bugs in... 

Merge "[resolved conflict] Merge "Fix 2 OOB bugs in LeAudioBroadcasterImpl::UpdateMetadata" into tm-qpr-dev am: b52a8e43 am: 9d91b513" into udc-dev am: 0dc5ef1c

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



Change-Id: Id68a9a7651e386874e00165b7fc9589a383cd044
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20ceaba8 0dc5ef1c

system/bta/le_audio/broadcaster/broadcaster.cc

+8 −0
Original line number Diff line number Diff line
@@ -302,6 +302,10 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 
            le_audio::types::kLeAudioMetadataTypeStreamingAudioContext);

        if (stream_context_vec) {

          auto pp = stream_context_vec.value().data();

          if (stream_context_vec.value().size() < 2) {

            LOG_ERROR("stream_context_vec.value() size < 2");

            return;

          }

          UINT16_TO_STREAM(pp, context_type.value());

        }

      }
@@ -310,6 +314,10 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 
          ltv.Find(le_audio::types::kLeAudioMetadataTypeStreamingAudioContext);

      if (stream_context_vec) {

        auto pp = stream_context_vec.value().data();

        if (stream_context_vec.value().size() < 2) {

          LOG_ERROR("stream_context_vec.value() size < 2");

          return;

        }

        STREAM_TO_UINT16(context_type.value_ref(), pp);

      }