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

Commit 30a4e1fd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: configs: Modify deprecated perf lock values"

parents 7142c4e8 22b30f94

configs/msm8998/audio_platform_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
        <param key="mono_speaker" value="right"/>

        <!-- In the below value string, first parameter indicates size -->

        <!-- followed by perf lock options                             -->

        <param key="perf_lock_opts" value="4, 0x101, 0x704, 0x20F, 0x1E01"/>

        <param key="perf_lock_opts" value="4, 0x40400000, 0x1, 0x40C00000, 0x1"/>

        <param key="native_audio_mode" value="src"/>

        <param key="input_mic_max_count" value="4"/>

        <param key="true_32_bit" value="true"/>

hal/audio_hw.c

+12 −13
Original line number Diff line number Diff line
@@ -1087,11 +1087,10 @@ static void check_usecases_codec_backend(struct audio_device *adev, 
              platform_get_snd_device_name(snd_device),

              platform_get_snd_device_name(usecase->out_snd_device),

              platform_check_backends_match(snd_device, usecase->out_snd_device));

        if ((usecase->type != PCM_CAPTURE) && (usecase != uc_info)) {

            uc_derive_snd_device = derive_playback_snd_device(adev->platform,

                                               usecase, uc_info, snd_device);

        if (usecase->type != PCM_CAPTURE &&

            usecase != uc_info &&

            ((uc_derive_snd_device != usecase->out_snd_device) || force_routing) &&

            if (((uc_derive_snd_device != usecase->out_snd_device) || force_routing) &&

                ((usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) ||

                (usecase->devices & AUDIO_DEVICE_OUT_AUX_DIGITAL) ||

                (usecase->devices & AUDIO_DEVICE_OUT_USB_DEVICE) ||
@@ -1099,7 +1098,6 @@ static void check_usecases_codec_backend(struct audio_device *adev, 
                (usecase->devices & AUDIO_DEVICE_OUT_ALL_SCO)) &&

                ((force_restart_session) ||

                (platform_check_backends_match(snd_device, usecase->out_snd_device)))) {



                ALOGD("%s:becf: check_usecases (%s) is active on (%s) - disabling ..",

                    __func__, use_case_table[usecase->id],

                      platform_get_snd_device_name(usecase->out_snd_device));
@@ -1110,6 +1108,7 @@ static void check_usecases_codec_backend(struct audio_device *adev, 
                num_uc_to_switch++;

            }

        }

    }



    ALOGD("%s:becf: check_usecases num.of Usecases to switch %d", __func__,

        num_uc_to_switch);