commit edbf8b85dbdf2a857f90dd79c8a6490f95b0791c
author Daniel Colascione <dancol@google.com> Wed Sep 04 18:41:27 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 04 18:41:27 2019 -0700
tree b62e613e000ef6edfc957473bb08b81ce3c86e03
parent 7af33a4fd5aca27be312ca2272e6f18c7a7965cb
parent b40bbd68d5c69f384e810dce7c6d29feaa79b384

Merge "Improve codegen slightly when doing FD validity checks" am: 9ad079ba58 am: 2378575dac am: 7f2d3393d1
am: b40bbd68d5

Change-Id: Ieace78b21cd492e3552663e12f055ddae69c4ce2

base/include/android-base/unique_fd.h

diff --git a/base/include/android-base/unique_fd.h b/base/include/android-base/unique_fd.h
index 6e11b4e..1605daf 100644
--- a/base/include/android-base/unique_fd.h
+++ b/base/include/android-base/unique_fd.h
@@ -120,7 +120,7 @@
   // Catch bogus error checks (i.e.: "!fd" instead of "fd != -1").
   bool operator!() const = delete;
 
-  bool ok() const { return get() != -1; }
+  bool ok() const { return get() >= 0; }
 
   int release() __attribute__((warn_unused_result)) {
     tag(fd_, this, nullptr);