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

Commit 9bb0c1bd authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix nullability annotation" into main

parents d0156ec1 a4c2f9ba

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15096,7 +15096,7 @@ package android.graphics { 
    method public int getByteCount();

    method @NonNull public android.graphics.Color getColor(int, int);

    method @Nullable public android.graphics.ColorSpace getColorSpace();

    method @NonNull public android.graphics.Bitmap.Config getConfig();

    method @Nullable public android.graphics.Bitmap.Config getConfig();

    method public int getDensity();

    method @Nullable public android.graphics.Gainmap getGainmap();

    method public int getGenerationId();

graphics/java/android/graphics/Bitmap.java

+1 −1
Original line number Diff line number Diff line
@@ -1779,7 +1779,7 @@ public final class Bitmap implements Parcelable { 
     * If the bitmap's internal config is in one of the public formats, return

     * that config, otherwise return null.

     */

    @NonNull

    @Nullable

    public final Config getConfig() {

        if (mRecycled) {

            Log.w(TAG, "Called getConfig() on a recycle()'d bitmap! This is undefined behavior!");