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

Commit aaa49f2c authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "liblogcat: redirect logcat output correctly for -Q" am: 151fec40 am: f2b62408 

am: a119bcc8

Change-Id: Ic0b73fa49ef8b88c2e89740ce1dee71b7df2113e
parents 6fe26a65 a119bcc8

logcat/logcat.cpp

+5 −2
Original line number Diff line number Diff line
@@ -1231,8 +1231,11 @@ static int __logcat(android_logcat_context_internal* context) { 
                    android::close_error(context);

                    context->stderr_stdout = true;

                    context->output = fp;

                    context->error = context->output;

                    if (context->stderr_null) context->error = NULL;

                    context->output_fd = fileno(fp);

                    if (context->stderr_null) break;

                    context->stderr_stdout = true;

                    context->error = fp;

                    context->error_fd = fileno(fp);

                }

                break;