diff options
author | Matt Lee <matthewhlee@google.com> | 2022-10-05 18:55:12 -0700 |
---|---|---|
committer | Matt Lee <matthewhlee@google.com> | 2022-10-05 18:55:12 -0700 |
commit | 8e0ec351652fe153a44c77fec634c509fb8b3ac0 (patch) | |
tree | 3825711927530238fd3c878df6c34362779c1946 /audio/common/all-versions/default/7.0/HidlUtils.cpp | |
parent | 19733b62b886ba8480d5d339f640f9b3a6ecdf06 (diff) | |
parent | 3a26d6dff22704a7e331af1275ea5c4466688e76 (diff) |
Merge s-mpr-2022-10
Change-Id: I476be304fe714af742ac5361235d66610c735545
Diffstat (limited to 'audio/common/all-versions/default/7.0/HidlUtils.cpp')
-rw-r--r-- | audio/common/all-versions/default/7.0/HidlUtils.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/common/all-versions/default/7.0/HidlUtils.cpp b/audio/common/all-versions/default/7.0/HidlUtils.cpp index 5a5b5d276a..af29da61f3 100644 --- a/audio/common/all-versions/default/7.0/HidlUtils.cpp +++ b/audio/common/all-versions/default/7.0/HidlUtils.cpp @@ -894,7 +894,7 @@ status_t HidlUtils::audioTransportsToHal(const hidl_vec<AudioTransport>& transpo for (const auto& transport : transports) { switch (transport.audioCapability.getDiscriminator()) { case AudioTransport::AudioCapability::hidl_discriminator::profile: - if (halPort->num_audio_profiles > AUDIO_PORT_MAX_AUDIO_PROFILES) { + if (halPort->num_audio_profiles >= AUDIO_PORT_MAX_AUDIO_PROFILES) { ALOGE("%s, too many audio profiles", __func__); result = BAD_VALUE; break; @@ -910,7 +910,8 @@ status_t HidlUtils::audioTransportsToHal(const hidl_vec<AudioTransport>& transpo result); break; case AudioTransport::AudioCapability::hidl_discriminator::edid: - if (halPort->num_extra_audio_descriptors > AUDIO_PORT_MAX_EXTRA_AUDIO_DESCRIPTORS) { + if (halPort->num_extra_audio_descriptors >= + AUDIO_PORT_MAX_EXTRA_AUDIO_DESCRIPTORS) { ALOGE("%s, too many extra audio descriptors", __func__); result = BAD_VALUE; break; |