From: Jiwen 'Steve' Cai <jwcai@google.com>
Date: Mon, 8 May 2017 23:02:36 +0000 (-0700)
Subject: Fix BufferHubQueueProducer::dequeueBuffer
X-Git-Tag: android-x86-9.0-r1~523^2~10^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b85082115a3c7b900ff7f0200f2fd6fa49f8d191;p=android-x86%2Fframeworks-native.git

Fix BufferHubQueueProducer::dequeueBuffer

Seems this might just be a rebase glitch.

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

diff --git a/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp b/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
index 0a36156acd..435cba44ba 100644
--- a/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
+++ b/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
@@ -140,10 +140,10 @@ status_t BufferHubQueueProducer::dequeueBuffer(
     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() &&