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

Commit d9653bdb authored by Andy Hung's avatar Andy Hung
Browse files

audio_hw: Check if usb device is removed before opening stream 

This fixes a fast insert-removal race condition when the
usb device is removed right before it is opened by AudioFlinger.

Test: dedicated HAL failure config, plug/unplug usb.
Bug: 64043790
Bug: 64090435
Change-Id: Ie5c8e9c7f7f0bc1c7dc2ee20838d6287275e0b1b
parent f07d6b39

hal/audio_hw.c

+24 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,22 @@ static int read_usb_sup_params_and_compare(bool is_playback, 
    return ret < 0 ? -EINVAL : 0; // HACK TBD

}



static bool is_usb_ready(struct audio_device *adev, bool is_playback)

{

    // Check if usb is ready.

    // The usb device may have been removed quickly after insertion and hence

    // no longer available.  This will show up as empty channel masks, or rates.



    pthread_mutex_lock(&adev->lock);

    uint32_t supported_sample_rate;



    // we consider usb ready if we can fetch at least one sample rate.

    const bool ready = read_usb_sup_sample_rates(

            is_playback, &supported_sample_rate, 1 /* max_rates */) > 0;

    pthread_mutex_unlock(&adev->lock);

    return ready;

}



static audio_usecase_t get_voice_usecase_id_from_list(struct audio_device *adev)

{

    struct audio_usecase *usecase;
@@ -3563,6 +3579,10 @@ static int adev_open_output_stream(struct audio_hw_device *dev, 
                      (devices != AUDIO_DEVICE_OUT_USB_ACCESSORY);

    bool direct_dev = is_hdmi || is_usb_dev;



    if (is_usb_dev && !is_usb_ready(adev, true /* is_playback */)) {

        return -ENOSYS;

    }



    ALOGV("%s: enter: sample_rate(%d) channel_mask(%#x) devices(%#x) flags(%#x)",

          __func__, config->sample_rate, config->channel_mask, devices, flags);

    *stream_out = NULL;
@@ -4190,6 +4210,10 @@ static int adev_open_input_stream(struct audio_hw_device *dev, 
    ALOGV("%s: enter", __func__);

    *stream_in = NULL;



    if (is_usb_dev && !is_usb_ready(adev, false /* is_playback */)) {

        return -ENOSYS;

    }



    if (!(is_usb_dev && may_use_hifi_record)) {

        if (config->sample_rate == 0)

            config->sample_rate = DEFAULT_INPUT_SAMPLING_RATE;