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

Commit 1d9684cf 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: 0be1ec5c am: 89a55225 am: 9e5ee290

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

Change-Id: Iec4ed57f1f13723ebea3e8646e54cb287c41a0c3
parents dc00cabc 9e5ee290

services/audioflinger/AudioFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -684,8 +684,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();

    }
@@ -711,7 +711,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: