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

Commit 16a1aa06 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

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

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22919959', 'googleplex-android-review.googlesource.com/24737501', 'googleplex-android-review.googlesource.com/24737502', 'googleplex-android-review.googlesource.com/24737503', 'googleplex-android-review.googlesource.com/24737504', 'googleplex-android-review.googlesource.com/24737505', 'googleplex-android-review.googlesource.com/24638916', 'googleplex-android-review.googlesource.com/24638579', 'googleplex-android-review.googlesource.com/23356997', 'googleplex-android-review.googlesource.com/24234506', 'googleplex-android-review.googlesource.com/24972364'] into security-aosp-tm-release.

Change-Id: I142169e5149703456243dd64c09a14453e5ae332
parents 9d74d4c0 495417bd

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

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

    vm->DetachCurrentThread();

    sHaveCallbackThread = false;

    callbackEnv = NULL;

  }

}

system/btif/src/btif_avrcp_audio_track.cc

+5 −3
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <base/logging.h>

#include <utils/StrongPointer.h>



#include <algorithm>



#include "bt_target.h"

#include "osi/include/log.h"
@@ -152,7 +154,7 @@ static size_t transcodeQ15ToFloat(uint8_t* buffer, size_t length, 
                                  BtifAvrcpAudioTrack* trackHolder) {

  size_t sampleSize = sampleSizeFor(trackHolder);

  size_t i = 0;

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

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

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

  }

  return i * sampleSize;
@@ -162,7 +164,7 @@ static size_t transcodeQ23ToFloat(uint8_t* buffer, size_t length, 
                                  BtifAvrcpAudioTrack* trackHolder) {

  size_t sampleSize = sampleSizeFor(trackHolder);

  size_t i = 0;

  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 * kScaleQ23ToFloat;
@@ -174,7 +176,7 @@ static size_t transcodeQ31ToFloat(uint8_t* buffer, size_t length, 
                                  BtifAvrcpAudioTrack* trackHolder) {

  size_t sampleSize = sampleSizeFor(trackHolder);

  size_t i = 0;

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

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

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

  }

  return i * sampleSize;

system/main/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,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",

system/main/shim/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ filegroup { 
        "metrics_api.cc",

        "shim.cc",

        "stack.cc",

    ]

        "utils.cc",

    ],

}

system/main/shim/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ source_set("LibBluetoothShimSources") { 
    "metrics_api.cc",

    "shim.cc",

    "stack.cc",

    "utils.cc",

  ]



  include_dirs = [