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

Commit 9dae4583 authored by Glenn Kasten's avatar Glenn Kasten 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: 97937ef8 am: fa47739e am: 2a9274cd am: e98479eb

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

Change-Id: I11e4c07fb17914f474d5ca5ab5c756b7e04d6d5c
parents e34c1e79 e98479eb

media/libnbaio/include/media/nbaio/Pipe.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
namespace android {



// Pipe is multi-thread safe for readers (see PipeReader), but safe for only a single writer thread.

// It cannot UNDERRUN on write, unless we allow designation of a master reader that provides the

// It cannot UNDERRUN on write, unless we allow designation of a primary reader that provides the

// time-base. Readers can be added and removed dynamically, and it's OK to have no readers.

class Pipe : public NBAIO_Sink {

media/utils/EventLogTags.logtags

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
# 6: Percent

# Default value for data of type int/long is 2 (bytes).

#

# See system/core/logcat/event.logtags for the master copy of the tags.

# See system/core/logcat/event.logtags for the original definition of the tags.



# 61000 - 61199 reserved for audioserver

services/audioflinger/AudioFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1283,9 +1283,9 @@ status_t AudioFlinger::setMasterMute(bool muted) 
    }



    // Now set the master mute in each playback thread.  Playback threads

    // assigned to HALs which do not have master mute support will apply master

    // mute during the mix operation.  Threads with HALs which do support master

    // mute will simply ignore the setting.

    // assigned to HALs which do not have master mute support will apply master mute

    // during the mix operation.  Threads with HALs which do support master mute

    // will simply ignore the setting.

    Vector<VolumeInterface *> volumeInterfaces = getAllVolumeInterfaces_l();

    for (size_t i = 0; i < volumeInterfaces.size(); i++) {

        volumeInterfaces[i]->setMasterMute(muted);

services/audioflinger/Threads.cpp

+1 −1
Original line number Diff line number Diff line
@@ -7313,7 +7313,7 @@ reacquire_wakelock: 


            const ssize_t availableToRead = mPipeSource->availableToRead();

            if (availableToRead >= 0) {

                // PipeSource is the master clock.  It is up to the AudioRecord client to keep up.

                // PipeSource is the primary clock.  It is up to the AudioRecord client to keep up.

                LOG_ALWAYS_FATAL_IF((size_t)availableToRead > mPipeFramesP2,

                        "more frames to read than fifo size, %zd > %zu",

                        availableToRead, mPipeFramesP2);