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

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

Snap for 6069976 from b7b870db to rvc-release 

Change-Id: I356415f968d3a29edf922534d90b72c3d859cf17
parents 4d1aa08c b7b870db

apex/ld.config.txt

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ namespace.default.links = platform 
# TODO: replace the following when apex has a way to auto-generate this list

# namespace.default.link.platform.shared_libs  = %LLNDK_LIBRARIES%

# namespace.default.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%

namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libdl_android.so:libvulkan.so

namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libdl_android.so:libvulkan.so:libbinder_ndk.so



###############################################################################

# "platform" namespace
@@ -132,7 +132,7 @@ namespace.sphal.links = platform 
# TODO: replace the following when apex has a way to auto-generate this list

# namespace.sphal.link.platform.shared_libs  = %LLNDK_LIBRARIES%

# namespace.sphal.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%

namespace.sphal.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so

namespace.sphal.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so:libbinder_ndk.so



# Add a link for libz.so which is llndk on devices where VNDK is not enforced.

namespace.sphal.link.platform.shared_libs += libz.so

include/soundtrigger/ISoundTrigger.h

+7 −1
Original line number Diff line number Diff line
@@ -41,7 +41,13 @@ public: 
                                      const sp<IMemory>& dataMemory) = 0;

    virtual status_t stopRecognition(sound_model_handle_t handle) = 0;

    virtual status_t getModelState(sound_model_handle_t handle) = 0;



    virtual status_t setParameter(sound_model_handle_t handle,

            sound_trigger_model_parameter_t param, int32_t value) = 0;

    virtual status_t getParameter(sound_model_handle_t handle,

            sound_trigger_model_parameter_t param, int32_t* value) = 0;

    virtual status_t queryParameter(sound_model_handle_t handle,

            sound_trigger_model_parameter_t param,

            sound_trigger_model_parameter_range_t* param_range) = 0;

};



// ----------------------------------------------------------------------------

include/soundtrigger/SoundTrigger.h

+7 −0
Original line number Diff line number Diff line
@@ -55,6 +55,13 @@ public: 
            status_t startRecognition(sound_model_handle_t handle, const sp<IMemory>& dataMemory);

            status_t stopRecognition(sound_model_handle_t handle);

            status_t getModelState(sound_model_handle_t handle);

            status_t setParameter(sound_model_handle_t handle,

                    sound_trigger_model_parameter_t param, int32_t value);

            status_t getParameter(sound_model_handle_t handle,

                    sound_trigger_model_parameter_t param, int32_t* value);

            status_t queryParameter(sound_model_handle_t handle,

                    sound_trigger_model_parameter_t param,

                    sound_trigger_model_parameter_range_t* param_range);



            // BpSoundTriggerClient

            virtual void onRecognitionEvent(const sp<IMemory>& eventMemory);

media/libmediahelper/TypeConverter.cpp

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ const UsageTypeConverter::Table UsageTypeConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_GAME),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_VIRTUAL_SOURCE),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_ASSISTANT),

    MAKE_STRING_FROM_ENUM(AUDIO_USAGE_CALL_ASSISTANT),

    TERMINATOR

};

services/audiopolicy/engine/common/src/EngineDefaultConfig.h

+7 −0
Original line number Diff line number Diff line
@@ -107,6 +107,13 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
         }

     },

    },

    {"STRATEGY_CALL_ASSISTANT",

     {

         {"", AUDIO_STREAM_PATCH, "AUDIO_STREAM_PATCH",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_CALL_ASSISTANT, AUDIO_SOURCE_DEFAULT, 0, ""}}

         }

     },

    },

    {"STRATEGY_TRANSMITTED_THROUGH_SPEAKER",

     {

         {"", AUDIO_STREAM_TTS, "AUDIO_STREAM_TTS",