From d5be5ea85ff5b794ed3b4463836aa314369bc399 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Tue, 23 Aug 2022 02:33:53 -0600 Subject: [PATCH] berlin: Decommonize some some audio and blobs These audio and blobs differ between what berlin and dubai each have Change-Id: I87f8037a5e41f017a36e246f3f3f5dc29379602d --- audio/audio_effects.xml | 64 ++++++++ audio/audio_ext_spkr.conf | 24 +++ audio/audio_policy_configuration.xml | 227 +++++++++++++++++++++++++++ device.mk | 9 +- proprietary-files.txt | 70 +++++++++ 5 files changed, 391 insertions(+), 3 deletions(-) create mode 100644 audio/audio_effects.xml create mode 100644 audio/audio_ext_spkr.conf create mode 100644 audio/audio_policy_configuration.xml diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml new file mode 100644 index 0000000..852c27c --- /dev/null +++ b/audio/audio_effects.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf new file mode 100644 index 0000000..593aa4d --- /dev/null +++ b/audio/audio_ext_spkr.conf @@ -0,0 +1,24 @@ +global_config { + name Berlin +} + +ring { + #dB to attenuate playback to meet safety level at each volume step + #16 steps total, 15...0. In case of truncated list, last attenuation + #given will be applied to all lower volume steps + attenuation -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 +} + +voice { + #dB to attenuate playback to meet safety level at each volume step + #16 steps total, 15...0. In case of truncated list, last attenuation + #given will be applied to all lower volume steps + attenuation -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 +} + +media { + #dB to attenuate playback to meet safety level at each volume step + #16 steps total, 15...0. In case of truncated list, last attenuation + #given will be applied to all lower volume steps + attenuation -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 +} diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml new file mode 100644 index 0000000..df952e1 --- /dev/null +++ b/audio/audio_policy_configuration.xml @@ -0,0 +1,227 @@ + + + + + + + + + + + + + Earpiece + Speaker + Telephony Tx + Built-In Mic + Built-In Back Mic + Telephony Rx + FM tuner + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/device.mk b/device.mk index 7a74f42..9466ba0 100644 --- a/device.mk +++ b/device.mk @@ -38,10 +38,13 @@ PRODUCT_PACKAGES += \ # Audio PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - $(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ $(LOCAL_PATH)/audio/sku_yupik/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/audio_platform_info.xml \ - $(LOCAL_PATH)/audio/sku_yupik/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/mixer_paths.xml + $(LOCAL_PATH)/audio/sku_yupik/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/mixer_paths.xml \ + $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + $(LOCAL_PATH)/audio/audio_ext_spkr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_ext_spkr.conf \ + $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml # Fingerprint PRODUCT_PACKAGES += \ diff --git a/proprietary-files.txt b/proprietary-files.txt index 66dfdb0..c5de1c3 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -21,6 +21,17 @@ vendor/firmware/cs35l41-dsp1-spk-cali.wmfw vendor/firmware/cs35l41-dsp1-spk-prot.bin vendor/firmware/cs35l41-dsp1-spk-prot.wmfw +# Audio libraries +vendor/etc/maxx_conf.ini +vendor/etc/maxx_default.mps +vendor/lib/libAndroidAlgSys.so +vendor/lib/libacdbloader.so +vendor/lib/libc++_shared.so +vendor/lib64/libacdbloader.so + +# Audio - soundfx +vendor/lib/soundfx/libmaxxeffect-cembedded.so + # Camera vendor/etc/pwr/PowerFeatureConfig.xml vendor/etc/pwr/VideoPowerOptFeature.xml @@ -436,6 +447,10 @@ vendor/firmware/st21nfc_fw7.bin # OEM vendor/etc/vhw.xml +# Sensors +vendor/lib64/sensors.moto.so +vendor/lib64/sensors.ssc.so + # Sensor - configs vendor/etc/sensors/config/ak991x_0.json vendor/etc/sensors/config/kodiak_default_sensors.json @@ -585,3 +600,58 @@ vendor/firmware/csot_stm_fts_production_limits.csv vendor/firmware/stmicro-csot-fts3639-21120227-de141027-berlin.ftb vendor/firmware/stmicro-visionox-fts3639-21072312-0009200c-berlin.ftb vendor/firmware/visionox_stm_fts_production_limits.csv + +# Vibrator firmware +vendor/firmware/aw8695_haptic.bin +vendor/firmware/aw8695_rtp.bin +vendor/firmware/aw8695_rtp_Argo_Navis.bin +vendor/firmware/aw8695_rtp_Attentive.bin +vendor/firmware/aw8695_rtp_Awake.bin +vendor/firmware/aw8695_rtp_Bird_Loop.bin +vendor/firmware/aw8695_rtp_Brilliant_Times.bin +vendor/firmware/aw8695_rtp_Chimey_Phone.bin +vendor/firmware/aw8695_rtp_City_Lights.bin +vendor/firmware/aw8695_rtp_Complex.bin +vendor/firmware/aw8695_rtp_Crazy_Dream.bin +vendor/firmware/aw8695_rtp_Curve_Ball_Blend.bin +vendor/firmware/aw8695_rtp_Digital_Phone.bin +vendor/firmware/aw8695_rtp_Electrovision.bin +vendor/firmware/aw8695_rtp_Ether_Shake.bin +vendor/firmware/aw8695_rtp_Fateful_Words.bin +vendor/firmware/aw8695_rtp_Firefly.bin +vendor/firmware/aw8695_rtp_Flutey_Phone.bin +vendor/firmware/aw8695_rtp_Future_Funk.bin +vendor/firmware/aw8695_rtp_Future_Hi_Tech.bin +vendor/firmware/aw8695_rtp_Girtab.bin +vendor/firmware/aw8695_rtp_Hello.bin +vendor/firmware/aw8695_rtp_Hexagon.bin +vendor/firmware/aw8695_rtp_Hydra.bin +vendor/firmware/aw8695_rtp_Insert_Coin.bin +vendor/firmware/aw8695_rtp_Jumping_Dots.bin +vendor/firmware/aw8695_rtp_Keys.bin +vendor/firmware/aw8695_rtp_Loopy.bin +vendor/firmware/aw8695_rtp_Loopy_Lounge.bin +vendor/firmware/aw8695_rtp_Modular.bin +vendor/firmware/aw8695_rtp_Momentum.bin +vendor/firmware/aw8695_rtp_Morning.bin +vendor/firmware/aw8695_rtp_Moto.bin +vendor/firmware/aw8695_rtp_Moto_Original.bin +vendor/firmware/aw8695_rtp_Moto_Retro.bin +vendor/firmware/aw8695_rtp_Natural.bin +vendor/firmware/aw8695_rtp_New_Player.bin +vendor/firmware/aw8695_rtp_Now_or_Never.bin +vendor/firmware/aw8695_rtp_Onward.bin +vendor/firmware/aw8695_rtp_Organ_Dub.bin +vendor/firmware/aw8695_rtp_Overclocked.bin +vendor/firmware/aw8695_rtp_Pegasus.bin +vendor/firmware/aw8695_rtp_Play.bin +vendor/firmware/aw8695_rtp_Pyxis.bin +vendor/firmware/aw8695_rtp_Regrade.bin +vendor/firmware/aw8695_rtp_Scarabaeus.bin +vendor/firmware/aw8695_rtp_Sceptrum.bin +vendor/firmware/aw8695_rtp_Simple.bin +vendor/firmware/aw8695_rtp_Solarium.bin +vendor/firmware/aw8695_rtp_Sparse.bin +vendor/firmware/aw8695_rtp_Terrabytes.bin +vendor/firmware/aw8695_rtp_Verizon_Airwaves.bin +vendor/firmware/aw8695_rtp_Zero_Hour.bin