Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Nullability annotations to new Canvas APIs

Browse Source 
Added @NonNull annotation to drawDoubleRoundRect float array
parameters

Bug: 126702234
Test: N/A
Change-Id: Ib81fcc4ad6d5f2c471e4f6fb5ace4bdfc1d89b33
This commit is contained in:
Nader Jawad
2019-03-07 09:43:34 -08:00
parent dbd7154348
commit fbe2eabd3b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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);

4
graphics/java/android/graphics/BaseCanvas.java
View File

@@ -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) {

4
graphics/java/android/graphics/Canvas.java
View File

@@ -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);
}