diff --git a/BoardConfig.mk b/BoardConfig.mk index aa29646..5137a82 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -87,7 +87,7 @@ AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true -BOARD_SUPPORTS_SOUND_TRIGGER := true +BOARD_SUPPORTS_SOUND_TRIGGER := false BOARD_USES_ALSA_AUDIO := true USE_CUSTOM_AUDIO_POLICY := 1 USE_XML_AUDIO_POLICY_CONF := 1 diff --git a/audio/config/sound_trigger_mixer_paths.xml b/audio/config/sound_trigger_mixer_paths.xml deleted file mode 100644 index f6c99d3..0000000 --- a/audio/config/sound_trigger_mixer_paths.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/config/sound_trigger_mixer_paths_wcd9330.xml b/audio/config/sound_trigger_mixer_paths_wcd9330.xml deleted file mode 100644 index 2ad8750..0000000 --- a/audio/config/sound_trigger_mixer_paths_wcd9330.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/config/sound_trigger_platform_info.xml b/audio/config/sound_trigger_platform_info.xml deleted file mode 100644 index b92ea48..0000000 --- a/audio/config/sound_trigger_platform_info.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/device.mk b/device.mk index b689edc..2a05b3b 100755 --- a/device.mk +++ b/device.mk @@ -96,7 +96,6 @@ PRODUCT_PACKAGES += \ android.hardware.audio@5.0-impl.gts3l \ android.hardware.audio.effect@5.0-impl \ android.hardware.bluetooth.audio@2.0-impl \ - android.hardware.soundtrigger@2.2-impl \ audio.a2dp.default \ audio.bluetooth.default \ audio.primary.msm8996:32 \ @@ -113,8 +112,7 @@ PRODUCT_PACKAGES += \ libqcomvoiceprocessing \ libsndmonitor \ libspkrprot \ - libvolumelistener \ - sound_trigger.primary.msm8996 + libvolumelistener PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ @@ -124,9 +122,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/config/audio_platform_info_diff.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_diff.xml \ $(LOCAL_PATH)/audio/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(LOCAL_PATH)/audio/config/listen_platform_info.xml:system/etc/listen_platform_info.xml \ - $(LOCAL_PATH)/audio/config/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ - $(LOCAL_PATH)/audio/config/sound_trigger_mixer_paths_wcd9330.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_wcd9330.xml \ - $(LOCAL_PATH)/audio/config/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ $(LOCAL_PATH)/audio/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml PRODUCT_COPY_FILES += \ diff --git a/manifest.xml b/manifest.xml index 72dbfdd..3962881 100644 --- a/manifest.xml +++ b/manifest.xml @@ -231,15 +231,6 @@ default - - android.hardware.soundtrigger - hwbinder - 2.2 - - ISoundTriggerHw - default - - android.hardware.tetheroffload.config hwbinder @@ -490,7 +481,7 @@ - vendor.samsung.hardware.camera.provider + vendor.samsung.hardware.camera.provider hwbinder 2.4 diff --git a/proprietary-files.txt b/proprietary-files.txt index 08cc53a..876cf5b 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1150,13 +1150,6 @@ lib/libsensorlistener.so vendor/etc/sensors/hals.conf vendor/etc/sensors/sensor_def_qcomdev.conf -# Soundtrigger -vendor/lib/libaudio_soundtrigger.so -vendor/lib/libadpcmdec.so -vendor/lib/libsmwrapper.so -lib64/liblistensoundmodel2.so -lib/liblistensoundmodel2.so - # Thermal vendor/bin/thermal-engine vendor/etc/thermal-engine.conf