commit ebbfaf3fa3d56a2cd74e6bd4a5251c4e71ab8ae3
author Josh Gao <jmgao@google.com> Wed Sep 21 01:12:46 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 21 01:12:46 2016 +0000
tree 3336bd2b40179fa1a2332749a1f244e5f80deb7a
parent ebe91de21e093651ebf2c4c88a22b404a2aaa645
parent d1a3db64c5fd77c282d50a0f2bd7bd2296f73c9a

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

Change-Id: Ica8691bfa5ff84dabe9e026dfae46e8093cf4fb4

cmds/dumpsys/dumpsys.cpp

diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index d19e98a..772d17f 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -203,7 +203,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