diff options
| author | Elliott Hughes <enh@google.com> | 2016-03-23 18:36:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-23 18:36:54 +0000 |
| commit | 6c03e3111d7ddcfe1b8ffad40b9680a669c674a7 (patch) | |
| tree | 1e23c81aba7651558da6ecd45fa7fccd34243bb9 /debuggerd/debuggerd.cpp | |
| parent | 4c9b1494e278185c54e684b90264a654b705582c (diff) | |
| parent | ae38923c3e8b395ead314194340a685c56d73aee (diff) | |
Merge "Switch debuggerd over to unique_fd."
Diffstat (limited to 'debuggerd/debuggerd.cpp')
| -rw-r--r-- | debuggerd/debuggerd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp index 97f40963c..ea91b621e 100644 --- a/debuggerd/debuggerd.cpp +++ b/debuggerd/debuggerd.cpp @@ -36,10 +36,10 @@ #include <log/logger.h> +#include <android-base/unique_fd.h> #include <cutils/debugger.h> #include <cutils/properties.h> #include <cutils/sockets.h> -#include <nativehelper/ScopedFd.h> #include <linux/input.h> @@ -632,7 +632,7 @@ static void monitor_worker_process(int child_pid, const debugger_request_t& requ static void handle_request(int fd) { ALOGV("handle_request(%d)\n", fd); - ScopedFd closer(fd); + android::base::unique_fd closer(fd); debugger_request_t request; memset(&request, 0, sizeof(request)); int status = read_request(fd, &request); |