commit 0037fb349b5c5b91989e0b3da32063930a53241e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 10 21:14:20 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 10 21:14:20 2020 +0000
tree e31abc58d5d8d787b65164eab63ca75f2e8cb7e0
parent ab69625b030c4baa9b5d27a66f705b8a5be7730f
parent f56a9d8da2a2cd01b2fa18ccdc5a5aea55718ca9

Merge "[RenderEngine] Fix use-after-move error" into rvc-dev am: a81aa9421e am: f56a9d8da2

Change-Id: I4643fcb95ccd4aab0cba23c18c4d7226cf85db51

libs/renderengine/gl/GLESRenderEngine.cpp

diff --git a/libs/renderengine/gl/GLESRenderEngine.cpp b/libs/renderengine/gl/GLESRenderEngine.cpp
index 0d4305b..e73f245 100644
--- a/libs/renderengine/gl/GLESRenderEngine.cpp
+++ b/libs/renderengine/gl/GLESRenderEngine.cpp
@@ -957,9 +957,13 @@
         return NO_ERROR;
     }
 
-    if (bufferFence.get() >= 0 && !waitFence(std::move(bufferFence))) {
-        ATRACE_NAME("Waiting before draw");
-        sync_wait(bufferFence.get(), -1);
+    if (bufferFence.get() >= 0) {
+        // Duplicate the fence for passing to waitFence.
+        base::unique_fd bufferFenceDup(dup(bufferFence.get()));
+        if (bufferFenceDup < 0 || !waitFence(std::move(bufferFenceDup))) {
+            ATRACE_NAME("Waiting before draw");
+            sync_wait(bufferFence.get(), -1);
+        }
     }
 
     if (buffer == nullptr) {