Change computeOutputColorType() to mimic old behavior

src/codec/SkAndroidCodec.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAndroidCodec.h"
 #include "SkCodec.h"
 #include "SkCodecPriv.h"
@@ skipping 61 matching lines @@
             break;
         case kRGB_565_SkColorType:
             if (kOpaque_SkAlphaType == this->getInfo().alphaType()) {
                 return kRGB_565_SkColorType;
             }
             break;
         default:
             break;
     }
 
+    // Android has limited support for kGray_8 (using kAlpha_8).  We will not
+    // use kGray_8 for Android unless they specifically ask for it.
+    if (kGray_8_SkColorType == suggestedColorType) {

[msarett, 2015/12/11 16:41:13]

As you stated in another review, we need this to match SkImageDecoder_libpng.

+        return kN32_SkColorType;
+    }
+
+    // This may be kN32_SkColorType or kIndex_8_SkColorType.
     return suggestedColorType;
 }
 
 SkAlphaType SkAndroidCodec::computeOutputAlphaType(bool requestedUnpremul) {
     if (kOpaque_SkAlphaType == this->getInfo().alphaType()) {
         return kOpaque_SkAlphaType;
     }
     return requestedUnpremul ? kUnpremul_SkAlphaType : kPremul_SkAlphaType;
 }
 
@@ skipping 69 matching lines @@
         }
     }
 
     return this->onGetAndroidPixels(info, pixels, rowBytes, *options);
 }
 
 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels,
         size_t rowBytes) {
     return this->getAndroidPixels(info, pixels, rowBytes, nullptr);
 }