From fbe2eabd3bda8dc33f38f21736b10e85d95bbaa7 Mon Sep 17 00:00:00 2001 From: Nader Jawad Date: Thu, 7 Mar 2019 09:43:34 -0800 Subject: [PATCH] Added Nullability annotations to new Canvas APIs Added @NonNull annotation to drawDoubleRoundRect float array parameters Bug: 126702234 Test: N/A Change-Id: Ib81fcc4ad6d5f2c471e4f6fb5ace4bdfc1d89b33 --- api/current.txt | 2 +- graphics/java/android/graphics/BaseCanvas.java | 4 ++-- graphics/java/android/graphics/Canvas.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/current.txt b/api/current.txt index 5a2ab79ddd722..52c28522aaabb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13771,7 +13771,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); diff --git a/graphics/java/android/graphics/BaseCanvas.java b/graphics/java/android/graphics/BaseCanvas.java index aaf40b41bc313..60b2586190867 100644 --- a/graphics/java/android/graphics/BaseCanvas.java +++ b/graphics/java/android/graphics/BaseCanvas.java @@ -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) { diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 034dff09946dd..8f46e1acc2bad 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -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); }