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

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

Snap for 12361654 from 178065ac to 24Q4-release 

Change-Id: I78e6ca39b6f54de6d1d8e0bd2734d982b8259572
parents 83987880 178065ac

audio/aidl/vts/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ cc_test { 
    name: "VtsHalHapticGeneratorTargetTest",

    defaults: ["VtsHalAudioEffectTargetTestDefaults"],

    srcs: ["VtsHalHapticGeneratorTargetTest.cpp"],

    shared_libs: [

        "libaudioutils",

    ],

}



cc_test {

audio/aidl/vts/EffectHelper.h

+11 −0
Original line number Diff line number Diff line
@@ -454,6 +454,17 @@ class EffectHelper { 
        mOutputSamples = common.output.frameCount * mOutputFrameSize / sizeof(float);

    }



    void generateInput(std::vector<float>& input, float inputFrequency, float samplingFrequency,

                       size_t inputSize = 0) {

        if (inputSize == 0 || inputSize > input.size()) {

            inputSize = input.size();

        }



        for (size_t i = 0; i < inputSize; i++) {

            input[i] = sin(2 * M_PI * inputFrequency * i / samplingFrequency);

        }

    }



    bool mIsSpatializer;

    Descriptor mDescriptor;

    size_t mInputFrameSize, mOutputFrameSize;

audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp

+315 −343

File changed.

Preview size limit exceeded, changes collapsed.

secure_element/aidl/default/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ apex { 
    prebuilts: [

        "secure_element.rc",

        "secure_element.xml",

        "android.hardware.se.omapi.ese.prebuilt.xml", // <feature>

        // TODO (b/289193458): Add this back when access control is implemented for cuttlefish.

        // "android.hardware.se.omapi.ese.prebuilt.xml", // <feature>

    ],

}

security/rkp/OWNERS

+0 −1
Original line number Diff line number Diff line
@@ -2,4 +2,3 @@ 


jbires@google.com

sethmo@google.com
 
trong@google.com