From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Tue, 9 May 2017 08:03:02 +0000 (+0000)
Subject: Merge "Remove slices from buffers" into oc-dev
X-Git-Tag: android-x86-9.0-r1~523^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c91f12131;p=android-x86%2Fframeworks-native.git

Merge "Remove slices from buffers" into oc-dev
---

5c91f12131525c0a7202f0558c634770136e350f
diff --cc libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
index 435cba44ba,c886c27d3b..81e1669da7
--- a/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
+++ b/libs/vr/libbufferhubqueue/buffer_hub_queue_producer.cpp
@@@ -138,12 -138,12 +138,12 @@@ status_t BufferHubQueueProducer::dequeu
  
    for (size_t retry = 0; retry < BufferHubQueue::kMaxQueueCapacity; retry++) {
      LocalHandle fence;
-     auto buffer_status  =
+     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() &&