commit b2a1ac9ee40ee4196bd6944828f04e6f3575c0ee
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 03 22:54:33 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 03 22:54:34 2017 +0000
tree b08b41f04e6517e43bf0ab4323be31857a3c5fe0
parent 623912183d8314595b37cdedc7c193a21c345bdb
parent 3ff772317b108a78f6eee42ad8fe932553f5d9d8

Merge "Use gralloc1 usage in AHardwareBuffer_describe" into oc-dev

libs/nativewindow/AHardwareBuffer.cpp

diff --git a/libs/nativewindow/AHardwareBuffer.cpp b/libs/nativewindow/AHardwareBuffer.cpp
index 1ed150b..a38b4dc 100644
--- a/libs/nativewindow/AHardwareBuffer.cpp
+++ b/libs/nativewindow/AHardwareBuffer.cpp
@@ -28,6 +28,7 @@
 #include <ui/GraphicBuffer.h>
 #include <system/graphics.h>
 #include <hardware/gralloc1.h>
+#include <grallocusage/GrallocUsageConversion.h>
 
 #include <private/android/AHardwareBufferHelpers.h>
 
@@ -100,8 +101,12 @@
     outDesc->width = gbuffer->getWidth();
     outDesc->height = gbuffer->getHeight();
     outDesc->layers = gbuffer->getLayerCount();
+
+    uint64_t producerUsage = 0;
+    uint64_t consumerUsage = 0;
+    android_convertGralloc0To1Usage(gbuffer->getUsage(), &producerUsage, &consumerUsage);
     AHardwareBuffer_convertFromGrallocUsageBits(&outDesc->usage0, &outDesc->usage1,
-            gbuffer->getUsage(), gbuffer->getUsage());
+            producerUsage, consumerUsage);
     outDesc->format = AHardwareBuffer_convertFromPixelFormat(
             static_cast<uint32_t>(gbuffer->getPixelFormat()));
 }