commit 5bb709c31ec4e77838bf426192b957c7be7c70e2
author Leon Scroggins <scroggo@google.com> Tue Apr 24 20:01:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 20:01:22 2018 +0000
tree e57682c4870a4d543e059f1a835513892ecf5ca0
parent eabeec49c4de290071d27c272071b3151ff6e502
parent 3eadfde67f32bebf109634110a0e189263fa7e11

Merge "Attach color space after performing a readback" into pi-dev

libs/hwui/hwui/Bitmap.cpp

diff --git a/libs/hwui/hwui/Bitmap.cpp b/libs/hwui/hwui/Bitmap.cpp
index 795ec5b..263d249 100644
--- a/libs/hwui/hwui/Bitmap.cpp
+++ b/libs/hwui/hwui/Bitmap.cpp
@@ -296,6 +296,11 @@
             outBitmap->allocPixels(info());
         }
         uirenderer::renderthread::RenderProxy::copyGraphicBufferInto(graphicBuffer(), outBitmap);
+        if (mInfo.colorSpace()) {
+            sk_sp<SkPixelRef> pixelRef = sk_ref_sp(outBitmap->pixelRef());
+            outBitmap->setInfo(mInfo);
+            outBitmap->setPixelRef(std::move(pixelRef), 0, 0);
+        }
         return;
     }
     outBitmap->setInfo(mInfo, rowBytes());