commit c715e51a7454006aab1bf7c6bf6c5761fe5aaf25
author Nicolas Capens <nicolascapens@google.com> Mon Apr 12 15:53:50 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 12 15:53:50 2021 +0000
tree 3ac5e5a80b7289989c52d38b6c1250cc70713f9c
parent 61b934888b860f2b87716418d7da60777bbba320
parent 1e0ec09f5e3a1a51ad2a9844bc0cd870f364d5f5

Merge "Fix setting the dequeueBuffer timeout to -1" am: 1e0ec09f5e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1672445

Change-Id: I6fe2914be46870bc66b70a858ca106288cf56c0b

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 4b69bec..2913850 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -1088,7 +1088,8 @@
     ALOGW_IF(err != android::OK, "native_window_api_connect failed: %s (%d)",
              strerror(-err), err);
 
-    err = window->perform(window, NATIVE_WINDOW_SET_DEQUEUE_TIMEOUT, -1);
+    err =
+        window->perform(window, NATIVE_WINDOW_SET_DEQUEUE_TIMEOUT, nsecs_t{-1});
     if (err != android::OK) {
         ALOGE("window->perform(SET_DEQUEUE_TIMEOUT) failed: %s (%d)",
               strerror(-err), err);