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

Commit 88d739a3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Bypass CVD version check on automotive platform"

parents 0f805cd5 bea85841

configs/msmnile_au/mixer_paths_adp.xml

100755 → 100644
+139 −2056

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

configs/msmsteppe_au/mixer_paths_adp.xml

+26 −1582

File changed.

Preview size limit exceeded, changes collapsed.

hal/acdb.c

+9 −0
Original line number Diff line number Diff line
@@ -170,7 +170,13 @@ int acdb_init_v2(struct mixer *mixer) 
        ctl = mixer_get_ctl_by_name(mixer, CVD_VERSION_MIXER_CTL);

        if (!ctl) {

            ALOGE("%s: Could not get ctl for mixer cmd - %s",  __func__, CVD_VERSION_MIXER_CTL);

#ifdef PLATFORM_AUTO

            ALOGE("%s: Ctl check bypassed in automotive platform for mixer cmd - %s",

                   __func__, CVD_VERSION_MIXER_CTL);

            goto get_sound_card_name;

#else

            goto cleanup;

#endif

        }

        mixer_ctl_update(ctl);
@@ -185,6 +191,9 @@ int acdb_init_v2(struct mixer *mixer) 
        }

    }



#ifdef PLATFORM_AUTO

get_sound_card_name:

#endif

    /* Get Sound card name */

    snd_card_name = mixer_get_name(mixer);

    snd_card_name = platform_get_snd_card_name_for_acdb_loader(snd_card_name);