summaryrefslogtreecommitdiffstats
path: root/graphics/java/android/graphics/Paint.java
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2013-08-08 19:11:34 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2013-08-08 19:11:34 -0700
commit41207bce2a13c77bf03a05524ba3b3c59f486cc0 (patch)
tree31362f8e5a466c91c83bd44c822ea3e9ae262d39 /graphics/java/android/graphics/Paint.java
parent89d16f7597d9e03bf3cf9eb1ba91b590ab1ac892 (diff)
downloadframeworks_base-41207bce2a13c77bf03a05524ba3b3c59f486cc0.zip
frameworks_base-41207bce2a13c77bf03a05524ba3b3c59f486cc0.tar.gz
frameworks_base-41207bce2a13c77bf03a05524ba3b3c59f486cc0.tar.bz2
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
Diffstat (limited to 'graphics/java/android/graphics/Paint.java')
-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 331cf6e..69d9916 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;