From e78f7c9f48a4c8be118f250c397e5e034ef2e4de Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Wed, 31 Jul 2019 15:18:47 -0400 Subject: 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libs/hwui/HardwareBitmapUploader.cpp') diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp index 9bb6031b76ac..40bff88b7512 100644 --- a/libs/hwui/HardwareBitmapUploader.cpp +++ b/libs/hwui/HardwareBitmapUploader.cpp @@ -403,8 +403,9 @@ sk_sp HardwareBitmapUploader::allocateHardwareBitmap(const SkBitmap& sou 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() { -- cgit v1.2.3-59-g8ed1b