commit e78f7c9f48a4c8be118f250c397e5e034ef2e4de
author Derek Sollenberger <djsollen@google.com> Wed Jul 31 15:18:47 2019 -0400
committer Derek Sollenberger <djsollen@google.com> Fri Aug 09 11:41:51 2019 -0400
tree f55593b5a9a9b5c0d3a139dafb7dfcee39b1cbfb
parent 982a2f28dad6ea6386e7e4756e1ccb9b46e321d6

Move GraphicBuffer back into libandroid_runtime.

Update Bitmap to store AHardwareBuffer instead of GraphicBuffer and
begin removing references to GraphicBuffer from the graphics JNI code

Test: CtsUiRenderingTestCases
Bug: 137655431
Change-Id: If533b6d87a87ae7e94a9b6f16fc52043714087df

libs/hwui/HardwareBitmapUploader.cpp

diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp
index 9bb6031..40bff88 100644
--- a/libs/hwui/HardwareBitmapUploader.cpp
+++ b/libs/hwui/HardwareBitmapUploader.cpp
@@ -403,8 +403,9 @@
     if (!sUploader->uploadHardwareBitmap(bitmap, format, buffer)) {
         return nullptr;
     }
-    return Bitmap::createFrom(buffer, bitmap.colorType(), bitmap.refColorSpace(),
-                              bitmap.alphaType(), Bitmap::computePalette(bitmap));
+    return Bitmap::createFrom(buffer->toAHardwareBuffer(), bitmap.colorType(),
+                              bitmap.refColorSpace(), bitmap.alphaType(),
+			      Bitmap::computePalette(bitmap));
 }
 
 void HardwareBitmapUploader::initialize() {