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

Commit 8109bbe9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AAudio: fix logging information in AAudioServiceEndpointMMAP." into... 

Merge "AAudio: fix logging information in AAudioServiceEndpointMMAP." into udc-dev am: b092f41a am: 07fabe29

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/21911291



Change-Id: I04fbaa31c71b9c0c1bd841a10154f360ed81a942
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4a94bf8 07fabe29

services/oboeservice/AAudioServiceEndpointMMAP.cpp

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ aaudio_result_t AAudioServiceEndpointMMAP::open(const aaudio::AAudioStreamReques 
    while (true) {

        if (formatsTried.find(audioFormat) != formatsTried.end()) {

            // APM returning something that has already tried.

            ALOGW("Have already tried to open #x, but failed before");

            ALOGW("Have already tried to open with format=%#x, but failed before", audioFormat);

            break;

        }

        formatsTried.insert(audioFormat);
@@ -195,7 +195,7 @@ aaudio_result_t AAudioServiceEndpointMMAP::openWithFormat( 
        // not match the hardware.

        ALOGD("%s() - openMmapStream() returned status=%d, suggested format=%#x, sample_rate=%u, "

              "channel_mask=%#x",

              __func__, status, config.format, config.sample_rate, config.format);

              __func__, status, config.format, config.sample_rate, config.channel_mask);

        *nextFormatToTry = config.format != audioFormat ? config.format

                                                        : *nextFormatToTry;

        return AAUDIO_ERROR_UNAVAILABLE;