summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabrice Di Meglio <fdimeglio@google.com> 2013-08-09 18:11:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-08-09 18:11:33 +0000
commit5af4edef084f4d3f94af71acca53c68929e82008 (patch)
treeae0cf0a73f0f856ba0841691dce2ca5427b99e5e
parent5893a97cbf398ca3e1bff5444454343d94e25a4c (diff)
parent41207bce2a13c77bf03a05524ba3b3c59f486cc0 (diff)
Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev
-rw-r--r--graphics/java/android/graphics/Paint.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index 331cf6e6bc62..69d9916e3456 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;