commit 2c58e1924a7bf1b44049764fddb40c1704dc288f
author Ian Kasprzak <iankaz@google.com> Thu Apr 25 15:59:28 2019 +0000
committer Ian Kasprzak <iankaz@google.com> Thu Apr 25 15:59:28 2019 +0000
tree ac108140764b894ac24b6dceba42f7061fd6424f
parent 93d63c010ae24ff58acb70216bfcb93e3c73019a

Revert "Add a way to turn off unique_fd's operator int."

This reverts commit 93d63c010ae24ff58acb70216bfcb93e3c73019a.

Reason for revert: b/131312539 - All aosp-master-with-phones phones failing boot / health check.

Change-Id: Id4239f93484b7d6b8d9bcd355a59cbd40d9766e2

adb/sysdeps_unix.cpp

diff --git a/adb/sysdeps_unix.cpp b/adb/sysdeps_unix.cpp
index 3fdc917..4445a44 100644
--- a/adb/sysdeps_unix.cpp
+++ b/adb/sysdeps_unix.cpp
@@ -16,7 +16,7 @@
 
 #include "sysdeps.h"
 
-bool set_tcp_keepalive(borrowed_fd fd, int interval_sec) {
+bool set_tcp_keepalive(int fd, int interval_sec) {
     int enable = (interval_sec > 0);
     if (adb_setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &enable, sizeof(enable))) {
         return false;