From 3a8254ad38a8b3c5fd14334afb2b17e6935c1b99 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Tue, 12 Mar 2019 13:18:17 -0700 Subject: [PATCH] Change Font.Builder#build return type from @Nullable to @NonNull Bug: 124794844 Test: N/A Change-Id: Ib7a7a4605698dbda7a7f649708964b2b83916354 --- api/current.txt | 2 +- graphics/java/android/graphics/fonts/Font.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index f23d0614223b0..06173731dd9b6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15787,7 +15787,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); diff --git a/graphics/java/android/graphics/fonts/Font.java b/graphics/java/android/graphics/fonts/Font.java index f715f43344d3c..b4f88e4f79b95 100644 --- a/graphics/java/android/graphics/fonts/Font.java +++ b/graphics/java/android/graphics/fonts/Font.java @@ -356,7 +356,7 @@ public final class Font { * Creates the font based on the configured values. * @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); }