commit d1a3db64c5fd77c282d50a0f2bd7bd2296f73c9a
author Josh Gao <jmgao@google.com> Wed Sep 21 01:10:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 21 01:10:14 2016 +0000
tree eb0451a70eec157a8b1507830d8c706b6abb43c5
parent 7f3fdaa05968106ae32f38161d77feae53d8393c
parent 44bd6ca0d016041168b42a6dd7d47af485a28587

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

Change-Id: Ie664fd18862e404845b2702ff546719818190cd1

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