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

Commit ef8fa1e1 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 4ae72025 on remote branch 

Change-Id: Ia11076d4d1308c35464f290808de89118596b6bb
parents fba06491 4ae72025

configs/trinket/audio_platform_info_facepay.xml

0 → 100644
+531 −0

File added.

Preview size limit exceeded, changes collapsed.

configs/trinket/mixer_paths_facepay_tashalite.xml

0 → 100644
+3697 −0

File added.

Preview size limit exceeded, changes collapsed.

configs/trinket/trinket.mk

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ PRODUCT_COPY_FILES += \ 
    vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/mixer_paths_tavil.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tavil.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/mixer_paths_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tasha.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/mixer_paths_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_tashalite.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/mixer_paths_facepay_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_facepay_tashalite.xml \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_platform_info_facepay.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_facepay.xml \

    frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \

    frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml

hal/msm8974/hw_info.c

+3 −0
Original line number Diff line number Diff line
@@ -796,6 +796,9 @@ static void update_hardware_info_bear(struct hardware_info *hw_info, const char 
    } else if (!strncmp(snd_card_name, "trinket-tashalite-snd-card",

                 sizeof("trinket-tashalite-snd-card"))) {

        strlcpy(hw_info->name, "trinket", sizeof(hw_info->name));

    } else if (!strncmp(snd_card_name, "trinket-facepay-tashalite-snd-card",

                 sizeof("trinket-facepay-tashalite-snd-card"))) {

        strlcpy(hw_info->name, "trinket", sizeof(hw_info->name));

    } else if (!strncmp(snd_card_name, "trinket-tasha-snd-card",

                 sizeof("trinket-tasha-snd-card"))) {

        strlcpy(hw_info->name, "trinket", sizeof(hw_info->name));

hal/msm8974/platform.c

+2 −2
Original line number Diff line number Diff line
@@ -3389,11 +3389,11 @@ void *platform_init(struct audio_device *adev) 
            my_data, PLATFORM);

    } else if (!strncmp(snd_card_name, "kona-xrfusion-ult-snd-card",

               sizeof("kona-xrfusion-ult-snd-card"))) {

        platform_info_init(PLATFORM_INFO_XML_PATH_XRFUSION,

        platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_XRFUSION),

            my_data, PLATFORM);

    } else if (!strncmp(snd_card_name, "kona-xrfusionult-snd-card",

               sizeof("kona-xrfusionult-snd-card"))) {

        platform_info_init(PLATFORM_INFO_XML_PATH_XRFUSIONULT,

        platform_info_init(get_xml_file_path(PLATFORM_INFO_XML_PATH_XRFUSIONULT),

            my_data, PLATFORM);

    } else if (!strncmp(snd_card_name, "sm8150-tavil-qrd-snd-card",

               sizeof("sm8150-tavil-qrd-snd-card"))) {