Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a6ad4a8 authored by Chris Craik's avatar Chris Craik
Browse files

Re-hide shader mutation, remove colorfilter mutation 

Bug: 36025103
Bug: 37327129
Test: boots, CtsGraphicsTestCases passes

Change-Id: I937f8ae26ed47b4811dc033ed91c257670fc3a39
parent 3b41407f

api/current.txt

+0 −17
Original line number Diff line number Diff line
@@ -12600,7 +12600,6 @@ package android.graphics { 














  public class BitmapShader extends android.graphics.Shader {















    ctor public BitmapShader(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);













    method public void set(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);















  }





























  public class BlurMaskFilter extends android.graphics.MaskFilter {










@@ -12853,8 +12852,6 @@ package android.graphics {













    ctor public ColorMatrixColorFilter(android.graphics.ColorMatrix);















    ctor public ColorMatrixColorFilter(float[]);















    method public void getColorMatrix(android.graphics.ColorMatrix);













    method public void setColorMatrix(android.graphics.ColorMatrix);













    method public void setColorMatrixArray(float[]);















  }





























  public abstract class ColorSpace {










@@ -12995,8 +12992,6 @@ package android.graphics {













  public class ComposeShader extends android.graphics.Shader {















    ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);















    ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);













    method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);













    method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);















  }





























  public class CornerPathEffect extends android.graphics.PathEffect {










@@ -13069,15 +13064,11 @@ package android.graphics {













    ctor public LightingColorFilter(int, int);















    method public int getColorAdd();















    method public int getColorMultiply();













    method public void setColorAdd(int);













    method public void setColorMultiply(int);















  }





























  public class LinearGradient extends android.graphics.Shader {















    ctor public LinearGradient(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);















    ctor public LinearGradient(float, float, float, float, int, int, android.graphics.Shader.TileMode);













    method public void set(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);













    method public void set(float, float, float, float, int, int, android.graphics.Shader.TileMode);















  }





























  public class MaskFilter {










@@ -13587,10 +13578,6 @@ package android.graphics {



























  public class PorterDuffColorFilter extends android.graphics.ColorFilter {















    ctor public PorterDuffColorFilter(int, android.graphics.PorterDuff.Mode);













    method public int getColor();













    method public android.graphics.PorterDuff.Mode getMode();













    method public void setColor(int);













    method public void setMode(android.graphics.PorterDuff.Mode);















  }





























  public class PorterDuffXfermode extends android.graphics.Xfermode {









@@ -13600,8 +13587,6 @@ package android.graphics {













  public class RadialGradient extends android.graphics.Shader {















    ctor public RadialGradient(float, float, float, int[], float[], android.graphics.Shader.TileMode);















    ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);













    method public void set(float, float, float, int[], float[], android.graphics.Shader.TileMode);













    method public void set(float, float, float, int, int, android.graphics.Shader.TileMode);















  }





























  public final class Rect implements android.os.Parcelable {










@@ -13786,8 +13771,6 @@ package android.graphics {













  public class SweepGradient extends android.graphics.Shader {















    ctor public SweepGradient(float, float, int[], float[]);















    ctor public SweepGradient(float, float, int, int);













    method public void set(float, float, int[], float[]);













    method public void set(float, float, int, int);















  }





























  public class Typeface {

























api/system-current.txt



+0
−17




























Original line number
Diff line number
Diff line








@@ -13372,7 +13372,6 @@ package android.graphics {



























  public class BitmapShader extends android.graphics.Shader {















    ctor public BitmapShader(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);













    method public void set(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);















  }





























  public class BlurMaskFilter extends android.graphics.MaskFilter {










@@ -13625,8 +13624,6 @@ package android.graphics {













    ctor public ColorMatrixColorFilter(android.graphics.ColorMatrix);















    ctor public ColorMatrixColorFilter(float[]);















    method public void getColorMatrix(android.graphics.ColorMatrix);













    method public void setColorMatrix(android.graphics.ColorMatrix);













    method public void setColorMatrixArray(float[]);















  }





























  public abstract class ColorSpace {










@@ -13767,8 +13764,6 @@ package android.graphics {













  public class ComposeShader extends android.graphics.Shader {















    ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);















    ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);













    method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);













    method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);















  }





























  public class CornerPathEffect extends android.graphics.PathEffect {










@@ -13841,15 +13836,11 @@ package android.graphics {













    ctor public LightingColorFilter(int, int);















    method public int getColorAdd();















    method public int getColorMultiply();













    method public void setColorAdd(int);













    method public void setColorMultiply(int);















  }





























  public class LinearGradient extends android.graphics.Shader {















    ctor public LinearGradient(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);















    ctor public LinearGradient(float, float, float, float, int, int, android.graphics.Shader.TileMode);













    method public void set(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);













    method public void set(float, float, float, float, int, int, android.graphics.Shader.TileMode);















  }





























  public class MaskFilter {










@@ -14359,10 +14350,6 @@ package android.graphics {



























  public class PorterDuffColorFilter extends android.graphics.ColorFilter {















    ctor public PorterDuffColorFilter(int, android.graphics.PorterDuff.Mode);













    method public int getColor();













    method public android.graphics.PorterDuff.Mode getMode();













    method public void setColor(int);













    method public void setMode(android.graphics.PorterDuff.Mode);















  }





























  public class PorterDuffXfermode extends android.graphics.Xfermode {









@@ -14372,8 +14359,6 @@ package android.graphics {













  public class RadialGradient extends android.graphics.Shader {















    ctor public RadialGradient(float, float, float, int[], float[], android.graphics.Shader.TileMode);















    ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);













    method public void set(float, float, float, int[], float[], android.graphics.Shader.TileMode);













    method public void set(float, float, float, int, int, android.graphics.Shader.TileMode);















  }





























  public final class Rect implements android.os.Parcelable {










@@ -14558,8 +14543,6 @@ package android.graphics {













  public class SweepGradient extends android.graphics.Shader {















    ctor public SweepGradient(float, float, int[], float[]);















    ctor public SweepGradient(float, float, int, int);













    method public void set(float, float, int[], float[]);













    method public void set(float, float, int, int);















  }





























  public class Typeface {

























api/test-current.txt



+0
−17




























Original line number
Diff line number
Diff line








@@ -12642,7 +12642,6 @@ package android.graphics {



























  public class BitmapShader extends android.graphics.Shader {















    ctor public BitmapShader(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);













    method public void set(android.graphics.Bitmap, android.graphics.Shader.TileMode, android.graphics.Shader.TileMode);















  }





























  public class BlurMaskFilter extends android.graphics.MaskFilter {










@@ -12895,8 +12894,6 @@ package android.graphics {













    ctor public ColorMatrixColorFilter(android.graphics.ColorMatrix);















    ctor public ColorMatrixColorFilter(float[]);















    method public void getColorMatrix(android.graphics.ColorMatrix);













    method public void setColorMatrix(android.graphics.ColorMatrix);













    method public void setColorMatrixArray(float[]);















  }





























  public abstract class ColorSpace {










@@ -13037,8 +13034,6 @@ package android.graphics {













  public class ComposeShader extends android.graphics.Shader {















    ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);















    ctor public ComposeShader(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);













    method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.Xfermode);













    method public void set(android.graphics.Shader, android.graphics.Shader, android.graphics.PorterDuff.Mode);















  }





























  public class CornerPathEffect extends android.graphics.PathEffect {










@@ -13111,15 +13106,11 @@ package android.graphics {













    ctor public LightingColorFilter(int, int);















    method public int getColorAdd();















    method public int getColorMultiply();













    method public void setColorAdd(int);













    method public void setColorMultiply(int);















  }





























  public class LinearGradient extends android.graphics.Shader {















    ctor public LinearGradient(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);















    ctor public LinearGradient(float, float, float, float, int, int, android.graphics.Shader.TileMode);













    method public void set(float, float, float, float, int[], float[], android.graphics.Shader.TileMode);













    method public void set(float, float, float, float, int, int, android.graphics.Shader.TileMode);















  }





























  public class MaskFilter {










@@ -13629,10 +13620,6 @@ package android.graphics {



























  public class PorterDuffColorFilter extends android.graphics.ColorFilter {















    ctor public PorterDuffColorFilter(int, android.graphics.PorterDuff.Mode);













    method public int getColor();













    method public android.graphics.PorterDuff.Mode getMode();













    method public void setColor(int);













    method public void setMode(android.graphics.PorterDuff.Mode);















  }





























  public class PorterDuffXfermode extends android.graphics.Xfermode {









@@ -13642,8 +13629,6 @@ package android.graphics {













  public class RadialGradient extends android.graphics.Shader {















    ctor public RadialGradient(float, float, float, int[], float[], android.graphics.Shader.TileMode);















    ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);













    method public void set(float, float, float, int[], float[], android.graphics.Shader.TileMode);













    method public void set(float, float, float, int, int, android.graphics.Shader.TileMode);















  }





























  public final class Rect implements android.os.Parcelable {










@@ -13828,8 +13813,6 @@ package android.graphics {













  public class SweepGradient extends android.graphics.Shader {















    ctor public SweepGradient(float, float, int[], float[]);















    ctor public SweepGradient(float, float, int, int);













    method public void set(float, float, int[], float[]);













    method public void set(float, float, int, int);















  }





























  public class Typeface {

























graphics/java/android/graphics/BitmapShader.java



+1
−20




























Original line number
Diff line number
Diff line








@@ -41,35 +41,16 @@ public class BitmapShader extends Shader {













     * @param tileY The tiling mode for y to draw the bitmap in.















     */















    public BitmapShader(@NonNull Bitmap bitmap, @NonNull TileMode tileX, @NonNull TileMode tileY) {













        set(bitmap, tileX, tileY);













        this(bitmap, tileX.nativeInt, tileY.nativeInt);















    }































    private BitmapShader(Bitmap bitmap, int tileX, int tileY) {













        setInternal(bitmap, tileX, tileY);













    }



























    /**













     * Reinitialize the BitmapShader's Bitmap and tile modes.













     *













     * @param bitmap The bitmap to use inside the shader













     * @param tileX The tiling mode for x to draw the bitmap in.













     * @param tileY The tiling mode for y to draw the bitmap in.













     */













    public void set(@NonNull Bitmap bitmap, @NonNull TileMode tileX, @NonNull TileMode tileY) {













        if (tileX == null || tileY == null) {













            throw new IllegalArgumentException();













        }













        setInternal(bitmap, tileX.nativeInt, tileY.nativeInt);













    }



























    private void setInternal(Bitmap bitmap, int tileX, int tileY) {















        if (bitmap == null) {















            throw new IllegalArgumentException("Bitmap must be non-null");















        }















        if (bitmap == mBitmap && tileX == mTileX && tileY == mTileY) {















            return;















        }













        discardNativeInstance();















        mBitmap = bitmap;















        mTileX = tileX;















        mTileY = tileY;

































graphics/java/android/graphics/ColorMatrixColorFilter.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -73,6 +73,8 @@ public class ColorMatrixColorFilter extends ColorFilter {













     * @see #getColorMatrix(ColorMatrix)















     * @see #setColorMatrixArray(float[])















     * @see ColorMatrix#reset()













     *













     * @hide















     */















    public void setColorMatrix(@Nullable ColorMatrix matrix) {















        discardNativeInstance();









@@ -99,6 +101,8 @@ public class ColorMatrixColorFilter extends ColorFilter {













     *















     * @throws ArrayIndexOutOfBoundsException if the specified array's















     *         length is < 20













     *













     * @hide















     */















    public void setColorMatrixArray(@Nullable float[] array) {















        // called '...Array' so that passing null isn't ambiguous