Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8ada279 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AHAL: use PCM_FORMAT_INVALID as the termination of format array." am:... 

Merge "AHAL: use PCM_FORMAT_INVALID as the termination of format array." am: d10869b2 am: 3c7da0cf am: ff4d1519 am: 2e10b87f

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2534999



Change-Id: I880170e82b4e797fd685c06d368c37e3e921bccd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d210c5e 2e10b87f

audio/aidl/default/usb/ModuleUsb.cpp

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ ndk::ScopedAStatus ModuleUsb::populateConnectedDevicePort(AudioPort* audioPort) 
    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]);