commit 25d42b5a2339ee29d4c52cab00ebcbcdb0496fd1
author Alec Mouri <alecmouri@google.com> Mon Jan 31 20:10:27 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 31 20:10:27 2022 +0000
tree 549ca7a65d2a91af8983cbdfff60b023cf0ddbe5
parent d029092f6bdba62f9fc9d6e0c180b0bb0b0d1111
parent ad741ccb93731e1fcfb307de1491eede00d096eb

Merge "Treat fence with error as invalid in terms of signal time"

libs/ui/Fence.cpp

diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
index 33ab7c4..cc96f83 100644
--- a/libs/ui/Fence.cpp
+++ b/libs/ui/Fence.cpp
@@ -132,9 +132,13 @@
         ALOGE("sync_file_info returned NULL for fd %d", mFenceFd.get());
         return SIGNAL_TIME_INVALID;
     }
+
     if (finfo->status != 1) {
+        const auto status = finfo->status;
+        ALOGE_IF(status < 0, "%s: sync_file_info contains an error: <%d> for fd: <%d>", __func__,
+                 status, mFenceFd.get());
         sync_file_info_free(finfo);
-        return SIGNAL_TIME_PENDING;
+        return status < 0 ? SIGNAL_TIME_INVALID : SIGNAL_TIME_PENDING;
     }
 
     uint64_t timestamp = 0;