commit 9f8be8c9e27db70a9e4afec9cee2dea55fdba1aa
author Mark Salyzyn <salyzyn@google.com> Wed Feb 22 01:29:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 22 01:29:48 2017 +0000
tree f5234dba44115e543191810b8e24915bf674d497
parent a3e7b335707453735008ef93db4a1638c793410e
parent 748b899aad789cf17c50953c97601e4b19366bc7

Merge "liblogcat: redirect logcat output correctly for -Q" am: 151fec4032
am: f2b62408b2

Change-Id: If045db1a428c44bf801c1602dd38bc2c10bc818a

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 15cef1a..7f852d4 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -1231,8 +1231,11 @@
                     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;