commit 5efd8c1be14273e61bf3a0b9f2c17dd055ad6570
author Jiwen 'Steve' Cai <jwcai@google.com> Tue May 09 01:54:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 09 01:54:47 2017 +0000
tree a7eecbc9719b0b376a6c4963d7e7781fa27b6402
parent 3defa56f66e5583189cbd56bfde8afc66fce83df
parent 6c7e8bee63dece94d66c3c49610102f44d5d9480

Merge "Fix BufferHubQueueProducer::dequeueBuffer" into oc-dev am: 1134dd38d8
am: 6c7e8bee63

Change-Id: I8147bd8fa2a183231d43dff731053b015c67dee4

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() &&