commit cd7c555aa9ef9f799e6a5a7581ec67dd13adedb6
author Android Build Merger (Role) <android-build-merger@google.com> Wed Aug 09 22:44:05 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 09 22:44:05 2017 +0000
tree fdedb3b02d09eb714ef5583568bd188219b953a0
parent 519d4f4a055cefe613f48f3d6d225cda7fa43e59
parent df836091741bf4cbcef39400dc0a7759ea9f6baa

Merge "Merge "Add future consideration for USB rndis notification handling" am: 4263a5ed58 am: 6ff0730158 am: ff14dd1274  -s ours" into oc-dr1-dev-plus-aosp

core/jni/android/graphics/Bitmap.cpp

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index be8b9de..b03c346 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -752,7 +752,8 @@
 
 static bool bitmapCopyTo(SkBitmap* dst, SkColorType dstCT, const SkBitmap& src,
         SkBitmap::Allocator* alloc) {
-    LOG_ALWAYS_FATAL_IF(kIndex_8_SkColorType == dstCT, "Error, cannot copyTo kIndex8.");
+    LOG_ALWAYS_FATAL_IF(kIndex_8_SkColorType == dstCT &&
+            kIndex_8_SkColorType != src.colorType(), "Error, cannot copyTo kIndex8.");
 
     SkPixmap srcPM;
     if (!src.peekPixels(&srcPM)) {
@@ -787,7 +788,7 @@
     if (!dst->setInfo(dstInfo)) {
         return false;
     }
-    if (!dst->tryAllocPixels(alloc, nullptr)) {
+    if (!dst->tryAllocPixels(alloc, srcPM.ctable())) {
         return false;
     }