commit 1134dd38d8e65a676c4ec8f5ae5b006917264be8
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 09 01:29:31 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 09 01:29:32 2017 +0000
tree 46e3a7880459f9624257c70f208b5ff6d0a13636
parent 95d4e522448618edb42701f755e0ed768c13fa76
parent b85082115a3c7b900ff7f0200f2fd6fa49f8d191

Merge "Fix BufferHubQueueProducer::dequeueBuffer" into oc-dev

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