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

Merge "Fix Nullability annotation"

Browse Source
This commit is contained in:
John Reck
2021-08-17 15:52:35 +00:00
committed by Android (Google) Code Review
parent 69d2fce651 9e91be3541
commit ba6dd78b58
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -14982,7 +14982,7 @@ package android.graphics {
method public void drawTextRun(@NonNull android.graphics.text.MeasuredText, int, int, int, int, float, float, boolean, @NonNull android.graphics.Paint);
method public void drawVertices(@NonNull android.graphics.Canvas.VertexMode, int, @NonNull float[], int, @Nullable float[], int, @Nullable int[], int, @Nullable short[], int, int, @NonNull android.graphics.Paint);
method public void enableZ();
method public boolean getClipBounds(@Nullable android.graphics.Rect);
method public boolean getClipBounds(@NonNull android.graphics.Rect);
method @NonNull public final android.graphics.Rect getClipBounds();
method public int getDensity();
method @Nullable public android.graphics.DrawFilter getDrawFilter();

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

@@ -1272,11 +1272,10 @@ public class Canvas extends BaseCanvas {
* in a way similar to quickReject, in that it tells you that drawing
* outside of these bounds will be clipped out.
*
* @param bounds Return the clip bounds here. If it is null, ignore it but
* still return true if the current clip is non-empty.
* @param bounds Return the clip bounds here.
* @return true if the current clip is non-empty.
*/
public boolean getClipBounds(@Nullable Rect bounds) {
public boolean getClipBounds(@NonNull Rect bounds) {
return nGetClipBounds(mNativeCanvasWrapper, bounds);
}