commit b85082115a3c7b900ff7f0200f2fd6fa49f8d191
author Jiwen 'Steve' Cai <jwcai@google.com> Mon May 08 16:02:36 2017 -0700
committer Jiwen Cai <jiwen@google.com> Mon May 08 23:27:31 2017 +0000
tree 6003469efbcc4f1ac7f23cc725aa93eec650702e
parent 663720b29f412756b8599897df9f8e32eb930be2

Fix BufferHubQueueProducer::dequeueBuffer

Seems this might just be a rebase glitch.

Bug: 38137230
Test: buffer_hub_queue_producer-test
Change-Id: I94ce059475fad4cf31cec52a9661eb6fc9cd2e00

libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp

diff --git a/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp b/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
index 0a36156..435cba4 100644
--- a/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
+++ b/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
@@ -140,10 +140,10 @@
     LocalHandle fence;
     auto buffer_status  =
         core_->producer_->Dequeue(core_->dequeue_timeout_ms_, &slot, &fence);
-    if (!buffer_producer)
-      return NO_MEMORY;
 
     buffer_producer = buffer_status.take();
+    if (!buffer_producer)
+      return NO_MEMORY;
 
     if (width == buffer_producer->width() &&
         height == buffer_producer->height() &&