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

Commit 1682cdf5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22932491',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22932491', 'googleplex-android-review.googlesource.com/22919959', 'googleplex-android-review.googlesource.com/24737769', 'googleplex-android-review.googlesource.com/24737770', 'googleplex-android-review.googlesource.com/24668801', 'googleplex-android-review.googlesource.com/24704938', 'googleplex-android-review.googlesource.com/24706103', 'googleplex-android-review.googlesource.com/23353294', 'googleplex-android-review.googlesource.com/24234506', 'googleplex-android-review.googlesource.com/24994487', 'googleplex-android-review.googlesource.com/25011463', 'googleplex-android-review.googlesource.com/25012272', 'googleplex-android-review.googlesource.com/25020212'] into security-aosp-udc-release.

Change-Id: I49f857cdecf0f62cbf39b33d81de00d631d4b70f
parents cbb30d72 fb76b30e

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -762,6 +762,7 @@ static void callback_thread_event(bt_cb_thread_evt event) { 
    }

    vm->DetachCurrentThread();

    sHaveCallbackThread = false;

    callbackEnv = NULL;

  }

}

system/bta/le_audio/broadcaster/broadcaster.cc

+9 −0
Original line number Diff line number Diff line
@@ -426,6 +426,10 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 
        auto stream_context_vec = ltv.Find(

            le_audio::types::kLeAudioMetadataTypeStreamingAudioContext);

        if (stream_context_vec) {

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

            LOG_ERROR("kLeAudioMetadataTypeStreamingAudioContext size < 2");

            return;

          }

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

          UINT16_TO_STREAM(pp, context_type.value());

        }
@@ -434,6 +438,11 @@ class LeAudioBroadcasterImpl : public LeAudioBroadcaster, public BigCallbacks { 
      auto stream_context_vec =

          ltv.Find(le_audio::types::kLeAudioMetadataTypeStreamingAudioContext);

      if (stream_context_vec) {

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

          LOG_ERROR("kLeAudioMetadataTypeStreamingAudioContext size < 2");

          return;

        }



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

        STREAM_TO_UINT16(context_type.value_ref(), pp);

      }

system/btif/src/btif_avrcp_audio_track.cc

+3 −3
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static size_t transcodeQ15ToFloat(uint8_t* buffer, size_t length, 
  size_t sampleSize = sampleSizeFor(trackHolder);

  size_t i = 0;

  const float scaledGain = trackHolder->gain * kScaleQ15ToFloat;

  for (; i <= length / sampleSize; i++) {

  for (; i < std::min(trackHolder->bufferLength, length / sampleSize); i++) {

    trackHolder->buffer[i] = ((int16_t*)buffer)[i] * scaledGain;

  }

  return i * sampleSize;
@@ -182,7 +182,7 @@ static size_t transcodeQ23ToFloat(uint8_t* buffer, size_t length, 
  size_t sampleSize = sampleSizeFor(trackHolder);

  size_t i = 0;

  const float scaledGain = trackHolder->gain * kScaleQ23ToFloat;

  for (; i <= length / sampleSize; i++) {

  for (; i < std::min(trackHolder->bufferLength, length / sampleSize); i++) {

    size_t offset = i * sampleSize;

    int32_t sample = *((int32_t*)(buffer + offset - 1)) & 0x00FFFFFF;

    trackHolder->buffer[i] = sample * scaledGain;
@@ -195,7 +195,7 @@ static size_t transcodeQ31ToFloat(uint8_t* buffer, size_t length, 
  size_t sampleSize = sampleSizeFor(trackHolder);

  size_t i = 0;

  const float scaledGain = trackHolder->gain * kScaleQ31ToFloat;

  for (; i <= length / sampleSize; i++) {

  for (; i < std::min(trackHolder->bufferLength, length / sampleSize); i++) {

    trackHolder->buffer[i] = ((int32_t*)buffer)[i] * scaledGain;

  }

  return i * sampleSize;

system/btif/test/btif_avrcp_audio_track_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ TEST_F(BtifAvrcpAudioTrackTest, 
  for (size_t index = 0; index < bufferLength; ++index) {

    data[index] = index;

  }

  BtifAvrcpAudioTrackWriteData(trackHolder, data, bufferLength - 1);

  BtifAvrcpAudioTrackWriteData(trackHolder, data, bufferLength);

  const int16_t* dataInt = (int16_t*)data;

  for (size_t index = 0; index < bufferLength / sampleSize; ++index) {

    const float expected = dataInt[index] * scaleQ15ToFloat * gainValue;

system/main/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ cc_test { 
        "shim/metrics_api.cc",

        "shim/shim.cc",

        "shim/stack.cc",

        "shim/utils.cc",

        "test/common_stack_test.cc",

        "test/main_shim_dumpsys_test.cc",

        "test/main_shim_test.cc",