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

Commit 3f540f58 authored by zaclimon's avatar zaclimon Committed by Michael Bestas
Browse files

hal: Ensure device_name is copied if empty 

For an unknown reason, an msm8960 device name gets empty even
though the value is correct platform side. Fix this copying
again directly if it's empty.

We don't have to worry about checking if it's valid since a check
has been performed before regarding it's validity.

Change-Id: I19e6c6e2a1d445259eb5a519b502d368149dc7fa
parent 4e4c7b44

hal/audio_hw.c

+18 −0
Original line number Diff line number Diff line
@@ -651,6 +651,16 @@ int enable_snd_device(struct audio_device *adev, 
            goto on_error;

        }



        /*

         * For some unknown reason, the device name gets empty for

         * msm8960 devices. Because we're sure that the sound device is valid,

         * copy it manually and apply the correct route.

        */



        if (strlen(device_name) == 0) {

            strcpy(device_name, platform_get_snd_device_name(snd_device));

        }



        ALOGD("%s: snd_device(%d: %s)", __func__, snd_device, device_name);

        audio_route_apply_and_update_path(adev->audio_route, device_name);

    }
@@ -708,6 +718,14 @@ int disable_snd_device(struct audio_device *adev, 
                return -EINVAL;

            }



            /*

             * Same reason as in enable_snd_device()

             */



            if (strlen(device_name) == 0) {

                strcpy(device_name, platform_get_snd_device_name(snd_device));

            }



            ALOGD("%s: snd_device(%d: %s)", __func__, snd_device, device_name);

            audio_route_reset_and_update_path(adev->audio_route, device_name);

        }