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

Commit 574c30be 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: 65703e6a am: 8375b929 am: 0a30ce1b am: dc00cabc am: 0eba2acd

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

Change-Id: I804213d14c0038bc1083c8694eca8fb733188c0b
parents d40b4497 0eba2acd

media/libaudioclient/AudioTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1936,7 +1936,7 @@ ssize_t AudioTrack::write(const 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): AudioTrack::write(buffer=%p, size=%zu (%zd)",

                __func__, mPortId, buffer, userSize, userSize);
@@ -2326,7 +2326,7 @@ nsecs_t AudioTrack::processAudioBuffer() 
                mUserData, &audioBuffer);

        size_t writtenSize = audioBuffer.size;



        // Sanity check on returned size

        // Validate on returned size

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

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

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