diff options
| author | 2019-02-28 11:56:57 -0500 | |
|---|---|---|
| committer | 2019-02-28 12:00:04 -0500 | |
| commit | 0dd9dd84bbf97e1ddf20f375e81191fc70fcf95b (patch) | |
| tree | c9d57056adf2713bd80d4ea5237719fa9cbaefe0 | |
| parent | 869f5c42a0fbf73e284949fd5fd58eaff7b8882b (diff) | |
Mark Bitmap#getColor as @NonNull
Bug: 126700762
Test: None
This method will never return null. It will either throw an Exception or
return the Color at the specified location. Update the annotation to
make that explicit.
Change-Id: I276c0f84eac030758714b6736da29a7fdc175b7c
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index fce28d9d8788..044ae7ea45a7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13550,7 +13550,7 @@ package android.graphics { method @CheckResult public android.graphics.Bitmap extractAlpha(android.graphics.Paint, int[]); method public int getAllocationByteCount(); method public int getByteCount(); - method public android.graphics.Color getColor(int, int); + method @NonNull public android.graphics.Color getColor(int, int); method @Nullable public android.graphics.ColorSpace getColorSpace(); method public android.graphics.Bitmap.Config getConfig(); method public int getDensity(); diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 8d3bac8622f6..4b1cf35ade82 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -1842,6 +1842,7 @@ public final class Bitmap implements Parcelable { * @throws IllegalStateException if the bitmap's config is {@link Config#HARDWARE} * */ + @NonNull public Color getColor(int x, int y) { checkRecycled("Can't call getColor() on a recycled bitmap"); checkHardware("unable to getColor(), " |