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
diff --git a/adb/shell_protocol.h b/adb/shell_protocol.h
index 4aab813..2c82689 100644
--- a/adb/shell_protocol.h
+++ b/adb/shell_protocol.h
@@ -21,7 +21,6 @@
#include <android-base/macros.h>
#include "adb.h"
-#include "adb_unique_fd.h"
// Class to send and receive shell protocol packets.
//
@@ -61,7 +60,7 @@
// should be dynamically allocated on the heap instead.
//
// |fd| is an open file descriptor to be used to send or receive packets.
- explicit ShellProtocol(borrowed_fd fd);
+ explicit ShellProtocol(int fd);
virtual ~ShellProtocol();
// Returns a pointer to the data buffer.
@@ -104,7 +103,7 @@
kHeaderSize = sizeof(Id) + sizeof(length_t)
};
- borrowed_fd fd_;
+ int fd_;
char buffer_[kBufferSize];
size_t data_length_ = 0, bytes_left_ = 0;