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

Commit 4ca23ac6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reset buffer after stop protolog to file" am: 18493d62 am: 140fb234... 

Merge "Reset buffer after stop protolog to file" am: 18493d62 am: 140fb234 am: 83bb3e26 am: 5d520cb0 am: bbbf3cfb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2411151



Change-Id: I8221692bdf2fc0d22fdcfa19b3bc236a75970741
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 784b09d7 bbbf3cfb

core/java/com/android/internal/protolog/BaseProtoLogImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ public class BaseProtoLogImpl { 
            if (writeToFile) {

                writeProtoLogToFileLocked();

                logAndPrintln(pw, "Log written to " + mLogFile + ".");

                mBuffer.resetBuffer();

            }

            if (mProtoLogEnabled) {

                logAndPrintln(pw, "ERROR: logging was re-enabled while waiting for flush.");