Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c03e311 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Switch debuggerd over to unique_fd."

parents 4c9b1494 ae38923c
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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);