| commit | 17c0d514dc96d974eee0f06aad0e3da4fe3cb2f2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon May 22 18:58:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 22 18:58:21 2023 +0000 |
| tree | cf0084c9a15d41d31b0ebb49dc9033ab6b305c43 | |
| parent | 2ef70764b0277d365847c3ba64a66d41bca77804 [diff] | |
| parent | c0a81b9dc69af81dff4b2c4b338c1a477c1d412d [diff] |
Merge "Use requested sample rate when it matches device sample rate." am: c0a81b9dc6 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2592208 Change-Id: I8e9afe8823aefcdef026d8cc6562713e0f6d8b8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c index 16065e2..57f523b 100644 --- a/modules/usbaudio/audio_hal.c +++ b/modules/usbaudio/audio_hal.c
@@ -1514,6 +1514,8 @@ ret = 0; } } + } else if (profile_is_sample_rate_valid(&device_info->profile, config->sample_rate)) { + in->config.rate = config->sample_rate; } } else if (profile_is_sample_rate_valid(&device_info->profile, config->sample_rate)) { in->config.rate = config->sample_rate;