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

Commit 87a1a853 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7604940 from cee75918 to sc-release 

Change-Id: Icf19baa1e149c05d97c16c28f217b38872c577c7
parents f10cd7e6 cee75918

bluetooth/audio/2.0/default/A2dpSoftwareAudioProvider.cpp

+6 −2
Original line number Diff line number Diff line
@@ -32,10 +32,14 @@ namespace implementation { 
using ::android::bluetooth::audio::BluetoothAudioSessionReport;

using ::android::hardware::Void;



// Here the buffer size is based on SBC

static constexpr uint32_t kPcmFrameSize = 4;  // 16 bits per sample / stereo

static constexpr uint32_t kPcmFrameCount = 128;

// SBC is 128, and here choose the LCM of 16, 24, and 32

static constexpr uint32_t kPcmFrameCount = 96;

static constexpr uint32_t kRtpFrameSize = kPcmFrameSize * kPcmFrameCount;

static constexpr uint32_t kRtpFrameCount = 7;  // max counts by 1 tick (20ms)

// The max counts by 1 tick (20ms) for SBC is about 7. Since using 96 for the

// PCM counts, here we just choose a greater number

static constexpr uint32_t kRtpFrameCount = 10;

static constexpr uint32_t kBufferSize = kRtpFrameSize * kRtpFrameCount;

static constexpr uint32_t kBufferCount = 2;  // double buffer

static constexpr uint32_t kDataMqSize = kBufferSize * kBufferCount;

bluetooth/audio/2.1/default/A2dpSoftwareAudioProvider.cpp

+6 −2
Original line number Diff line number Diff line
@@ -34,10 +34,14 @@ using ::android::bluetooth::audio::BluetoothAudioSessionReport_2_1; 
using ::android::hardware::Void;

using ::android::hardware::bluetooth::audio::V2_0::AudioConfiguration;



// Here the buffer size is based on SBC

static constexpr uint32_t kPcmFrameSize = 4;  // 16 bits per sample / stereo

static constexpr uint32_t kPcmFrameCount = 128;

// SBC is 128, and here we choose the LCM of 16, 24, and 32

static constexpr uint32_t kPcmFrameCount = 96;

static constexpr uint32_t kRtpFrameSize = kPcmFrameSize * kPcmFrameCount;

static constexpr uint32_t kRtpFrameCount = 7;  // max counts by 1 tick (20ms)

// The max counts by 1 tick (20ms) for SBC is about 7. Since using 96 for the

// PCM counts, here we just choose a greater number

static constexpr uint32_t kRtpFrameCount = 10;

static constexpr uint32_t kBufferSize = kRtpFrameSize * kRtpFrameCount;

static constexpr uint32_t kBufferCount = 2;  // double buffer

static constexpr uint32_t kDataMqSize = kBufferSize * kBufferCount;

keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ bool verify_attestation_record(const string& challenge, const string& app_id, 
    // TODO(b/136282179): When running under VTS-on-GSI the TEE-backed

    // keymaster implementation will report YYYYMM dates instead of YYYYMMDD

    // for the BOOT_PATCH_LEVEL.

    if (avb_verification_enabled()) {

    if (!is_gsi()) {

        for (int i = 0; i < att_hw_enforced.size(); i++) {

            if (att_hw_enforced[i].tag == TAG_BOOT_PATCHLEVEL ||

                att_hw_enforced[i].tag == TAG_VENDOR_PATCHLEVEL) {