commit 944e5e0c5276e9149180c316a7d30ad7ef44a284
author Eino-Ville Talvala <etalvala@google.com> Wed Mar 29 12:06:36 2017 -0700
committer Eino-Ville Talvala <etalvala@google.com> Wed Mar 29 12:08:55 2017 -0700
tree 02bda6966bbb1d4b279b5a28a663c2ccb5c0448d
parent df937b8255d86d97c97fd8d9ca7ea5352e2d8975

Include vendor gralloc0 flags in gralloc1 conversion.

Map GRALLOC_USAGE_PRIVATE_* fields into bits 28-31 of both producer
and consumer usage for gralloc1.

Test: Camera output works as normal, CTS not regressed
Bug: 35215313
Change-Id: I0736e0f513b193373b822830dbb0efe3f4263770

libgrallocusage/GrallocUsageConversion.cpp

diff --git a/libgrallocusage/GrallocUsageConversion.cpp b/libgrallocusage/GrallocUsageConversion.cpp
index 8164beb..10e728d 100644
--- a/libgrallocusage/GrallocUsageConversion.cpp
+++ b/libgrallocusage/GrallocUsageConversion.cpp
@@ -30,13 +30,17 @@
                                        /* ProducerUsage::CPU_WRITE_OFTEN | */
                                        ProducerUsage::GPU_RENDER_TARGET | ProducerUsage::PROTECTED |
                                        ProducerUsage::CAMERA | ProducerUsage::VIDEO_DECODER |
-                                       ProducerUsage::SENSOR_DIRECT_DATA;
+                                       ProducerUsage::SENSOR_DIRECT_DATA |
+                                       /* Private flags may be consumer or producer */
+                                       GRALLOC_USAGE_PRIVATE_MASK;
     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;
+                                       ConsumerUsage::RENDERSCRIPT | ConsumerUsage::GPU_DATA_BUFFER |
+                                       /* Private flags may be consumer or producer */
+                                       GRALLOC_USAGE_PRIVATE_MASK;
     *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) {