commit 8500e0f54f3052af9aeddc2b70c2d28a83b06ef1
author Yin-Chia Yeh <yinchiayeh@google.com> Tue Apr 04 12:59:27 2017 -0700
committer gitbuildkicker <android-build@google.com> Tue Apr 04 16:39:32 2017 -0700
tree ff1a0ad74102c32171abbb721e6daa85854050fd
parent b7679659b7800f96806c59701c406d93f479aeb8

Revert "Include vendor gralloc0 flags in gralloc1 conversion."

This reverts commit 944e5e0c5276e9149180c316a7d30ad7ef44a284.

Test: fix b/36876770
Bug: b/36876770
Change-Id: Ibbf1a5e04ff1f61061cf0bb679306324d1f543d3
(cherry picked from commit 164ec4ad268bf015060ab57dfa2e1750956de1ca)

libgrallocusage/GrallocUsageConversion.cpp

diff --git a/libgrallocusage/GrallocUsageConversion.cpp b/libgrallocusage/GrallocUsageConversion.cpp
index 10e728d..8164beb8 100644
--- a/libgrallocusage/GrallocUsageConversion.cpp
+++ b/libgrallocusage/GrallocUsageConversion.cpp
@@ -30,17 +30,13 @@
                                        /* ProducerUsage::CPU_WRITE_OFTEN | */
                                        ProducerUsage::GPU_RENDER_TARGET | ProducerUsage::PROTECTED |
                                        ProducerUsage::CAMERA | ProducerUsage::VIDEO_DECODER |
-                                       ProducerUsage::SENSOR_DIRECT_DATA |
-                                       /* Private flags may be consumer or producer */
-                                       GRALLOC_USAGE_PRIVATE_MASK;
+                                       ProducerUsage::SENSOR_DIRECT_DATA;
     constexpr uint64_t CONSUMER_MASK = ConsumerUsage::CPU_READ |
                                        /* ConsumerUsage::CPU_READ_OFTEN | */
                                        ConsumerUsage::GPU_TEXTURE | ConsumerUsage::HWCOMPOSER |
                                        ConsumerUsage::CLIENT_TARGET | ConsumerUsage::CURSOR |
                                        ConsumerUsage::VIDEO_ENCODER | ConsumerUsage::CAMERA |
-                                       ConsumerUsage::RENDERSCRIPT | ConsumerUsage::GPU_DATA_BUFFER |
-                                       /* Private flags may be consumer or producer */
-                                       GRALLOC_USAGE_PRIVATE_MASK;
+                                       ConsumerUsage::RENDERSCRIPT | ConsumerUsage::GPU_DATA_BUFFER;
     *producerUsage = static_cast<uint64_t>(usage) & PRODUCER_MASK;
     *consumerUsage = static_cast<uint64_t>(usage) & CONSUMER_MASK;
     if ((static_cast<uint32_t>(usage) & GRALLOC_USAGE_SW_READ_OFTEN) == GRALLOC_USAGE_SW_READ_OFTEN) {