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

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

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: a65bd73c am: 89b40152 am: a9f3bab9 am: 13f544f6 am: 589c4542

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

Change-Id: I531168537e15d7418cc985fde7481167e5c88869
parents 3ff74ec2 589c4542

media/libaudioclient/AudioRecord.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ ssize_t AudioRecord::read(void* buffer, size_t userSize, bool blocking) 
    }



    if (ssize_t(userSize) < 0 || (buffer == NULL && userSize != 0)) {

        // sanity-check. user is most-likely passing an error code, and it would

        // Validation. user is most-likely passing an error code, and it would

        // make the return value ambiguous (actualSize vs error).

        ALOGE("%s(%d) (buffer=%p, size=%zu (%zu)",

                __func__, mPortId, buffer, userSize, userSize);
@@ -1319,7 +1319,7 @@ nsecs_t AudioRecord::processAudioBuffer() 
        mCbf(EVENT_MORE_DATA, mUserData, &audioBuffer);

        size_t readSize = audioBuffer.size;



        // Sanity check on returned size

        // Validate on returned size

        if (ssize_t(readSize) < 0 || readSize > reqSize) {

            ALOGE("%s(%d):  EVENT_MORE_DATA requested %zu bytes but callback returned %zd bytes",

                    __func__, mPortId, reqSize, ssize_t(readSize));