From 8a50364941abec42ea531b05c0993799ad60692c Mon Sep 17 00:00:00 2001
From: Matt Sarett <msarett@google.com>
Date: Mon, 19 Dec 2016 17:00:59 -0500
Subject: [PATCH] Manual revert of "Decode to sRGB in BitmapFactory"

Test: Verified that this fixes rendering artifacts.

BUG:33741991

Change-Id: Ie56ecee668be6fc20acdfcfd1167232d7c46f1ff
---
 core/jni/android/graphics/BitmapFactory.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp
index 69c7054949322..724fccc2e91b6 100644
--- a/core/jni/android/graphics/BitmapFactory.cpp
+++ b/core/jni/android/graphics/BitmapFactory.cpp
@@ -395,7 +395,7 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
     SkAlphaType alphaType = codec->computeOutputAlphaType(requireUnpremultiplied);
 
     const SkImageInfo decodeInfo = SkImageInfo::Make(size.width(), size.height(),
-            decodeColorType, alphaType, codec->computeOutputColorSpace(decodeColorType));
+            decodeColorType, alphaType);
 
     // We always decode to sRGB, but only mark the bitmap with a color space if linear
     // blending is enabled.