summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Josh Gao <jmgao@google.com> 2016-09-21 01:12:46 +0000
committer android-build-merger <android-build-merger@google.com> 2016-09-21 01:12:46 +0000
commitebbfaf3fa3d56a2cd74e6bd4a5251c4e71ab8ae3 (patch)
tree3336bd2b40179fa1a2332749a1f244e5f80deb7a
parentebe91de21e093651ebf2c4c88a22b404a2aaa645 (diff)
parentd1a3db64c5fd77c282d50a0f2bd7bd2296f73c9a (diff)
Merge "Rename unique_fd::clear to unique_fd::reset." am: f9f04003f5 am: 44bd6ca0d0
am: d1a3db64c5 Change-Id: Ica8691bfa5ff84dabe9e026dfae46e8093cf4fb4
-rw-r--r--cmds/dumpsys/dumpsys.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp
index d19e98a10e..772d17f6ae 100644
--- a/cmds/dumpsys/dumpsys.cpp
+++ b/cmds/dumpsys/dumpsys.cpp
@@ -203,7 +203,7 @@ int main(int argc, char* const argv[])
// 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