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
2013-08-09 15:21:55 -07:00
parent 795a7decc2 5af4edef08
commit b945d80c9b
1 changed files with 2 additions and 0 deletions
--- 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;