| commit | ff4d1519d24fb5490516785ead4b19459b9c77ce | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 13 17:29:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 13 17:29:01 2023 +0000 |
| tree | 1240ceebb4a1658ab8b8b48c213dd8a695ee3e02 | |
| parent | cd06c1740a83243774f6152c8236f1276c9a1722 [diff] | |
| parent | 3c7da0cf68b167fb081c7e6c9adef5695c6a5b24 [diff] |
Merge "AHAL: use PCM_FORMAT_INVALID as the termination of format array." am: d10869b255 am: 3c7da0cf68 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2534999 Change-Id: Ie51df5ea8f7121ab5aa3e8207427dbb51158d897 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/usb/ModuleUsb.cpp b/audio/aidl/default/usb/ModuleUsb.cpp index 89895bf..ecdbd5c 100644 --- a/audio/aidl/default/usb/ModuleUsb.cpp +++ b/audio/aidl/default/usb/ModuleUsb.cpp
@@ -132,7 +132,7 @@ std::vector<int> sampleRates = populateSampleRatesFromProfile(&profile); for (size_t i = 0; i < std::min(MAX_PROFILE_FORMATS, AUDIO_PORT_MAX_AUDIO_PROFILES) && - profile.formats[i] != 0; + profile.formats[i] != PCM_FORMAT_INVALID; ++i) { auto audioFormatDescription = usb::legacy2aidl_pcm_format_AudioFormatDescription(profile.formats[i]);