Dup the correct fd for qemu pipe.
Logcat dup-es STDOUT and used the dup-ed file descriptor to write logging
information. Because of this writes happen on that fd and not on stdout.
This in turn causes no output in the LogcatService in the emulator.
The qemu-pipe forwarder now dup-es the same fd as logcat is using so
that we receive data again.
Bug: b/145214141
Test: Logcat works again in emulator 29.2.10
Change-Id: Ia6e2430f1d7a0476a5b438d315a9ea337c13806d
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 2d14bf3..02a61a5 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -865,7 +865,7 @@
}
}
// close output and error channels, replace with console
- dup2(fd, STDOUT_FILENO);
+ dup2(fd, output_fd_.get());
dup2(fd, STDERR_FILENO);
close(fd);
}