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

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

Merge "hal: Fix strncat problem, replace with strlcat"

parents 843d76a5 8e1c75a8

hal/audio_extn/audio_extn.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int32_t afe_proxy_set_channel_mapping(struct audio_device *adev, 
                                                     int channel_count)

{

    struct mixer_ctl *ctl;

    const char *mixer_ctl_name = "Playback Channel Map";

    const char *mixer_ctl_name = "Playback Device Channel Map";

    int set_values[8] = {0};

    int ret;

    ALOGV("%s channel_count:%d",__func__, channel_count);

hal/msm8974/platform.c

+9 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -3357,10 +3357,15 @@ int platform_set_channel_map(void *platform, int ch_count, char *ch_map, int snd 
        ALOGE("%s: Invalid channel mapping used", __func__);

        return -EINVAL;

    }

    strlcpy(mixer_ctl_name, "Playback Channel Map", sizeof(mixer_ctl_name));



    /*

     * If snd_id is greater than 0, stream channel mapping

     * If snd_id is below 0, typically -1, device channel mapping

     */

    if (snd_id >= 0) {

        snprintf(device_num, sizeof(device_num), "%d", snd_id);

        strlcat(mixer_ctl_name, device_num, 13);

        snprintf(mixer_ctl_name, sizeof(mixer_ctl_name), "Playback Channel Map%d", snd_id);

    } else {

        strlcpy(mixer_ctl_name, "Playback Device Channel Map", sizeof(mixer_ctl_name));

    }



    ALOGD("%s mixer_ctl_name:%s", __func__, mixer_ctl_name);