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