From 41207bce2a13c77bf03a05524ba3b3c59f486cc0 Mon Sep 17 00:00:00 2001 From: Fabrice Di Meglio Date: Thu, 8 Aug 2013 19:11:34 -0700 Subject: [PATCH] Fix bug #10205316 CTS (KLP): android.graphics tests are failing - fix null Shader case during copy Related to https://googleplex-android-review.googlesource.com/#/c/336815/7 Change-Id: I920d6bb181ddb92d6f771e5060fd1858430e71ad --- graphics/java/android/graphics/Paint.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 331cf6e6bc629..69d9916e34562 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -431,6 +431,8 @@ public class Paint { mRasterizer = paint.mRasterizer; if (paint.mShader != null) { mShader = paint.mShader.copy(); + } else { + mShader = null; } mTypeface = paint.mTypeface; mXfermode = paint.mXfermode;