commit d0974d780827ddc75a8ff41ae1e922c226f65f68
author Josh Gao <jmgao@google.com> Wed Sep 21 07:32:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 21 07:32:18 2016 +0000
tree 57e2386fd258c74f4fda02b3eab59a4324f344ad
parent eef9225b2253be9b59a5754c6e5da5e3c1e11c31
parent ebbfaf3fa3d56a2cd74e6bd4a5251c4e71ab8ae3

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

Change-Id: I85eda7ff3e72efefc378770276a6ba8db651b252

cmds/dumpsys/dumpsys.cpp

diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index 2e1a376..f0e7200 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -207,7 +207,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