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

Commit 14dc93d4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7263361 from 8ae3c375 to sc-release 

Change-Id: Ia2ef699690df7fefaeba5b4136c8ad10fa489153
parents c5019bb7 8ae3c375

drm/mediadrm/plugins/clearkey/hidl/CryptoPlugin.cpp

+4 −1
Original line number Diff line number Diff line
@@ -145,7 +145,10 @@ Return<void> CryptoPlugin::decrypt_1_2( 


    base = static_cast<uint8_t *>(static_cast<void *>(destBase->getPointer()));



    if (destBuffer.offset + destBuffer.size > destBase->getSize()) {

    totalSize = 0;

    if (__builtin_add_overflow(destBuffer.offset, destBuffer.size, &totalSize) ||

        totalSize > destBase->getSize()) {

        android_errorWriteLog(0x534e4554, "176444622");

        _hidl_cb(Status_V1_2::ERROR_DRM_FRAME_TOO_LARGE, 0, "invalid buffer size");

        return Void();

    }

media/libeffects/lvm/lib/Bundle/src/LVM_Process.cpp

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <system/audio.h>



#include "LVM_Private.h"

#include "ScalarArithmetic.h"

#include "VectorArithmetic.h"

#include "LVM_Coeffs.h"
@@ -178,6 +179,9 @@ LVM_ReturnStatus_en LVM_Process(LVM_Handle_t hInstance, const LVM_FLOAT* pInData 
                 * Apply the filter

                 */

                pInstance->pTEBiquad->process(pProcessed, pProcessed, NrFrames);

                for (auto i = 0; i < NrChannels * NrFrames; i++) {

                    pProcessed[i] = LVM_Clamp(pProcessed[i]);

                }

            }

            /*

             * Volume balance

services/audiopolicy/service/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ cc_library_shared { 
    ],



    shared_libs: [

        "libactivitymanager_aidl",

        "libaudioclient",

        "libaudioclient_aidl_conversion",

        "libaudiofoundation",
@@ -67,6 +68,7 @@ cc_library_shared { 
    ],



    export_shared_lib_headers: [

        "libactivitymanager_aidl",

        "libsensorprivacy",

        "media_permission-aidl-cpp",

    ],