diff options
| author | Ian Kasprzak <iankaz@google.com> | 2019-04-25 15:59:28 +0000 |
|---|---|---|
| committer | Ian Kasprzak <iankaz@google.com> | 2019-04-25 15:59:28 +0000 |
| commit | dfdf916d09f6583d3fd1db1e33c79ed60bff2480 (patch) | |
| tree | 8e02ad6551dcc3593b5105963c1d1d5a72fceefc /adb_unique_fd.h | |
| parent | 6bc77009177ba2de4c25a2c8f17bee826c0540a3 (diff) | |
| download | adb-dfdf916d09f6583d3fd1db1e33c79ed60bff2480.tar.gz | |
Revert "Add a way to turn off unique_fd's operator int."
This reverts commit 6bc77009177ba2de4c25a2c8f17bee826c0540a3.
Reason for revert: b/131312539 - All aosp-master-with-phones phones failing boot / health check.
Change-Id: Id4239f93484b7d6b8d9bcd355a59cbd40d9766e2
Diffstat (limited to 'adb_unique_fd.h')
| -rw-r--r-- | adb_unique_fd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/adb_unique_fd.h b/adb_unique_fd.h index b6c910a9..d47213d7 100644 --- a/adb_unique_fd.h +++ b/adb_unique_fd.h @@ -32,8 +32,6 @@ using unique_fd = android::base::unique_fd_impl<AdbCloser>; using unique_fd = android::base::unique_fd; #endif -using android::base::borrowed_fd; - template <typename T> int adb_close(const android::base::unique_fd_impl<T>&) __attribute__((__unavailable__("adb_close called on unique_fd"))); |