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

Commit 89a55225 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" am: 0be1ec5c

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

Change-Id: I0d5dc3a33486147db0ff950dcc2f6396ab216ad9
parents 8375b929 0be1ec5c
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -674,8 +674,8 @@ sp<AudioFlinger::Client> AudioFlinger::registerPid(pid_t pid)

sp<NBLog::Writer> AudioFlinger::newWriter_l(size_t size, const char *name)
{
    // If there is no memory allocated for logs, return a dummy writer that does nothing.
    // Similarly if we can't contact the media.log service, also return a dummy writer.
    // If there is no memory allocated for logs, return a no-op writer that does nothing.
    // Similarly if we can't contact the media.log service, also return a no-op writer.
    if (mLogMemoryDealer == 0 || sMediaLogService == 0) {
        return new NBLog::Writer();
    }
@@ -701,7 +701,7 @@ sp<NBLog::Writer> AudioFlinger::newWriter_l(size_t size, const char *name)
            }
        }
        // Even after garbage-collecting all old writers, there is still not enough memory,
        // so return a dummy writer
        // so return a no-op writer
        return new NBLog::Writer();
    }
success: