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

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

Merge "Change Font.Builder#build return type from @Nullable to @NonNull"

parents 7e8c7591 3a8254ad

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -15802,7 +15802,7 @@ package android.graphics.fonts { 
    ctor public Font.Builder(@NonNull android.os.ParcelFileDescriptor, @IntRange(from=0) long, @IntRange(from=0xffffffff) long);

    ctor public Font.Builder(@NonNull android.content.res.AssetManager, @NonNull String);

    ctor public Font.Builder(@NonNull android.content.res.Resources, int);

    method @Nullable public android.graphics.fonts.Font build() throws java.io.IOException;

    method @NonNull public android.graphics.fonts.Font build() throws java.io.IOException;

    method @NonNull public android.graphics.fonts.Font.Builder setFontVariationSettings(@Nullable String);

    method @NonNull public android.graphics.fonts.Font.Builder setFontVariationSettings(@Nullable android.graphics.fonts.FontVariationAxis[]);

    method @NonNull public android.graphics.fonts.Font.Builder setSlant(int);

graphics/java/android/graphics/fonts/Font.java

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ public final class Font { 
         *

         * @return the Font object

         */

        public @Nullable Font build() throws IOException {

        public @NonNull Font build() throws IOException {

            if (mException != null) {

                throw new IOException("Failed to read font contents", mException);

            }