Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d6a8c56 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mark Bitmap#getColor as @NonNull"

parents 68d8e946 0dd9dd84

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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();

graphics/java/android/graphics/Bitmap.java

+1 −0
Original line number Diff line number Diff line
@@ -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(), "