diff options
| -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 b9cd0bdff826..81a6950bbd46 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13554,7 +13554,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 920fb4cffbca..c064402f8345 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -1845,6 +1845,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(), " |