diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2013-08-09 15:21:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-09 15:21:55 -0700 |
| commit | b945d80c9bb91b90e48add2a4f665de02c63e28c (patch) | |
| tree | 022817efafa9611135d8de0162731f5d92c243e4 | |
| parent | 795a7decc2e9e547e0cf6291567d427a2a60517a (diff) | |
| parent | 5af4edef084f4d3f94af71acca53c68929e82008 (diff) | |
am 5af4edef: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev
* commit '5af4edef084f4d3f94af71acca53c68929e82008':
Fix bug #10205316 CTS (KLP): android.graphics tests are failing
| -rw-r--r-- | graphics/java/android/graphics/Paint.java | 2 |
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; |