commit a26795a8841bd19b6570de340e7ca088ce9b8816
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Mar 31 00:03:49 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 31 00:03:49 2018 +0000
tree d767ffbc39a6fa7a51764a9f5b3fb7caacf8d59b
parent 17d19b7d52d26c9ae6a05f702dee19a3ca8839ae
parent e9048f3982868f85abf95869360f29b5762ae6fc

Merge "Fix regression to drawBitmapArray" into pi-dev

core/jni/android_graphics_Canvas.cpp

diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp
index c9bfa13..7f90d8e 100644
--- a/core/jni/android_graphics_Canvas.cpp
+++ b/core/jni/android_graphics_Canvas.cpp
@@ -448,8 +448,9 @@
                             jboolean hasAlpha, jlong paintHandle) {
     // Note: If hasAlpha is false, kRGB_565_SkColorType will be used, which will
     // correct the alphaType to kOpaque_SkAlphaType.
-    SkImageInfo info = SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType,
-            GraphicsJNI::defaultColorSpace());
+    SkImageInfo info = SkImageInfo::Make(width, height,
+                           hasAlpha ? kN32_SkColorType : kRGB_565_SkColorType,
+                           kPremul_SkAlphaType);
     SkBitmap bitmap;
     bitmap.setInfo(info);
     sk_sp<Bitmap> androidBitmap = Bitmap::allocateHeapBitmap(&bitmap);