commit 44bd6ca0d016041168b42a6dd7d47af485a28587
author Josh Gao <jmgao@google.com> Wed Sep 21 01:07:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 21 01:07:32 2016 +0000
tree f24a22b2df5816d2fa94d253dae7ef595e3fd470
parent f4171ecd585e49043ada9ee7d60ea08741c77484
parent f9f04003f5f9b3705545ba524a19537699cdef01

Merge "Rename unique_fd::clear to unique_fd::reset."
am: f9f04003f5

Change-Id: I856ff1bdb5735a90e3b6c13d2f7a2deeff0388e0

cmds/dumpsys/dumpsys.cpp

diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index 7e5bbc5..0601c87 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -201,7 +201,7 @@
                 // call returns, to terminate our reads if the other end closes their copy of the
                 // file descriptor, but then hangs for some reason. There doesn't seem to be a good
                 // way to do this, though.
-                remote_end.clear();
+                remote_end.reset();
 
                 if (err != 0) {
                     aerr << "Error dumping service info: (" << strerror(err) << ") " << service_name