| commit | 6df9ee187735e6908b4d337b0d61e671bb0ac22b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon May 22 22:37:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 22 22:37:56 2023 +0000 |
| tree | 9fcaee353f146c5dea8cf5832a081d99beb244cf | |
| parent | 606ad4db8c5509476b9423de7e512fc34563ab55 [diff] | |
| parent | 6fbde4bf3a4196000bccf7cd4c3bda1177b5e3fd [diff] |
Merge "Use requested sample rate when it matches device sample rate." am: c0a81b9dc6 am: 17c0d514dc am: 0ce9f75613 am: 2849bf8c2b am: 4f9f42113c am: 6fbde4bf3a Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2592208 Change-Id: I6f715776dd46ab67a25fea0dc7dcf10e963c0f5b 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;