Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa

am: e871596f15

Change-Id: I9813e607ebaec363fe6cd1c7b389b8c4ce2d5e74

graphics/java/android/graphics/Paint.java

@@ -1115,6 +1115,8 @@ public class Paint {
         // old shader's pointer may be reused by another shader allocation later
         if (mShader != shader) {
             mNativeShader = -1;
+            // Release any native references to the old shader content
+            nSetShader(mNativePaint, 0);
         }
         // Defer setting the shader natively until getNativeInstance() is called
         mShader = shader;