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

Commit 8bcc12a9 authored by Nader Jawad's avatar Nader Jawad Committed by Android (Google) Code Review
Browse files

Merge "Added Nullability annotations to new Canvas APIs"

parents 92ed8d72 fbe2eabd

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -13779,7 +13779,7 @@ package android.graphics { 
    method public void drawColor(@ColorInt int, @NonNull android.graphics.BlendMode);

    method public void drawColor(@ColorLong long, @NonNull android.graphics.BlendMode);

    method public void drawDoubleRoundRect(@NonNull android.graphics.RectF, float, float, @NonNull android.graphics.RectF, float, float, @NonNull android.graphics.Paint);

    method public void drawDoubleRoundRect(@NonNull android.graphics.RectF, float[], @NonNull android.graphics.RectF, float[], @NonNull android.graphics.Paint);

    method public void drawDoubleRoundRect(@NonNull android.graphics.RectF, @NonNull float[], @NonNull android.graphics.RectF, @NonNull float[], @NonNull android.graphics.Paint);

    method public void drawLine(float, float, float, float, @NonNull android.graphics.Paint);

    method public void drawLines(@Size(multiple=4) @NonNull float[], int, int, @NonNull android.graphics.Paint);

    method public void drawLines(@Size(multiple=4) @NonNull float[], @NonNull android.graphics.Paint);

graphics/java/android/graphics/BaseCanvas.java

+2 −2
Original line number Diff line number Diff line
@@ -425,8 +425,8 @@ public abstract class BaseCanvas { 
     * Make lint happy.

     * See {@link Canvas#drawDoubleRoundRect(RectF, float[], RectF, float[], Paint)}

     */

    public void drawDoubleRoundRect(@NonNull RectF outer, float[] outerRadii,

            @NonNull RectF inner, float[] innerRadii, @NonNull Paint paint) {

    public void drawDoubleRoundRect(@NonNull RectF outer, @NonNull float[] outerRadii,

            @NonNull RectF inner, @NonNull float[] innerRadii, @NonNull Paint paint) {

        throwIfHasHwBitmapInSwMode(paint);

        if (innerRadii == null || outerRadii == null

                || innerRadii.length != 8 || outerRadii.length != 8) {

graphics/java/android/graphics/Canvas.java

+2 −2
Original line number Diff line number Diff line
@@ -2018,8 +2018,8 @@ public class Canvas extends BaseCanvas { 
     * @param paint The paint used to draw the double roundRect

     */

    @Override

    public void drawDoubleRoundRect(@NonNull RectF outer, float[] outerRadii,

            @NonNull RectF inner, float[] innerRadii, @NonNull Paint paint) {

    public void drawDoubleRoundRect(@NonNull RectF outer, @NonNull float[] outerRadii,

            @NonNull RectF inner, @NonNull float[] innerRadii, @NonNull Paint paint) {

        super.drawDoubleRoundRect(outer, outerRadii, inner, innerRadii, paint);

    }