commit 795bd0fe93e8bb5214e22cd38aea6a9dc651604b
author Chris Craik <ccraik@google.com> Fri Dec 16 15:22:31 2016 -0800
committer Chris Craik <ccraik@google.com> Fri Dec 16 15:48:32 2016 -0800
tree 56f0f697e91cf7494f80866c1a00e2b7978af1e1
parent ff53f923e90e6cd3cc75ef3481e2013291af4254

Fix ViewCaptureTest, Bitmap.sameAs

Bug: 33702897
Test: tests added to android.graphics.cts.BitmapTest, all passing

Change-Id: I41b06114929df3c0c9bf826c721a29630e8c5098

core/jni/android/graphics/Bitmap.cpp

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 673cf86..d33d20b 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -1127,8 +1127,7 @@
     }
 }
 
-static jboolean Bitmap_sameAs(JNIEnv* env, jobject, jlong bm0Handle,
-                              jlong bm1Handle) {
+static jboolean Bitmap_sameAs(JNIEnv* env, jobject, jlong bm0Handle, jlong bm1Handle) {
     SkBitmap bm0;
     SkBitmap bm1;
 
@@ -1144,11 +1143,11 @@
 
     bitmap0->bitmap().getSkBitmap(&bm0);
     bitmap1->bitmap().getSkBitmap(&bm1);
-    if (bm0.width() != bm1.width() ||
-        bm0.height() != bm1.height() ||
-        bm0.colorType() != bm1.colorType() ||
-        bm0.alphaType() != bm1.alphaType() ||
-        bm0.colorSpace() != bm1.colorSpace()) {
+    if (bm0.width() != bm1.width()
+            || bm0.height() != bm1.height()
+            || bm0.colorType() != bm1.colorType()
+            || bm0.alphaType() != bm1.alphaType()
+            || !SkColorSpace::Equals(bm0.colorSpace(), bm1.colorSpace())) {
         return JNI_FALSE;
     }