commit 044963e1dd0479035b6e5f2c6bd618bde7143710
author Jiwen 'Steve' Cai <jwcai@google.com> Mon May 01 22:43:21 2017 -0700
committer Jiwen 'Steve' Cai <jwcai@google.com> Tue May 02 10:18:35 2017 -0700
tree 4b34b20196b95d12fea9b2fa34ea16a21e93e04c
parent 2041913a05b79b96c5c084f30bb8944049a976c8

Deprecate producer/consumer usage: Step 1

Clean up producer/consumer usage from IonBuffer.

Bug: 37881101
Test: Build, flash, ran particles.apk
Change-Id: I66a8c4db2348b014a7b458b69157ed7c150112e1

services/vr/bufferhubd/producer_channel.cpp

diff --git a/services/vr/bufferhubd/producer_channel.cpp b/services/vr/bufferhubd/producer_channel.cpp
index c946a8d..c4b1319 100644
--- a/services/vr/bufferhubd/producer_channel.cpp
+++ b/services/vr/bufferhubd/producer_channel.cpp
@@ -37,8 +37,8 @@
       meta_size_bytes_(meta_size_bytes),
       meta_(meta_size_bytes ? new uint8_t[meta_size_bytes] : nullptr) {
   for (auto& ion_buffer : slices_) {
-    const int ret =
-        ion_buffer.Alloc(width, height, format, producer_usage, consumer_usage);
+    const int ret = ion_buffer.Alloc(width, height, format,
+                                     (producer_usage | consumer_usage));
     if (ret < 0) {
       ALOGE("ProducerChannel::ProducerChannel: Failed to allocate buffer: %s",
             strerror(-ret));
@@ -76,7 +76,7 @@
 BufferHubChannel::BufferInfo ProducerChannel::GetBufferInfo() const {
   return BufferInfo(buffer_id(), consumer_channels_.size(), slices_[0].width(),
                     slices_[0].height(), slices_[0].format(),
-                    slices_[0].producer_usage(), slices_[0].consumer_usage(),
+                    slices_[0].usage(), slices_[0].usage(),
                     slices_.size(), name_);
 }
 
@@ -376,8 +376,7 @@
   return slices_.size() == slice_count && meta_size_bytes == meta_size_bytes_ &&
          slices_[0].width() == width && slices_[0].height() == height &&
          slices_[0].format() == format &&
-         slices_[0].producer_usage() == producer_usage &&
-         slices_[0].consumer_usage() == consumer_usage;
+         slices_[0].usage() == (producer_usage | consumer_usage);
 }
 
 }  // namespace dvr