commit 7c8b15414177bccc5e84366d0a045c013f2c4831
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 13 23:01:14 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 13 23:01:14 2019 +0000
tree 099444ec7f4d9675689872c2d6170c82beccba5c
parent 7e8c759140ae3923e0e9a45924a124fa4a07791b
parent 3a8254ad38a8b3c5fd14334afb2b17e6935c1b99

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

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 626669c..ef9b44c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15802,7 +15802,7 @@
     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

diff --git a/graphics/java/android/graphics/fonts/Font.java b/graphics/java/android/graphics/fonts/Font.java
index f92802f..c788f32 100644
--- a/graphics/java/android/graphics/fonts/Font.java
+++ b/graphics/java/android/graphics/fonts/Font.java
@@ -360,7 +360,7 @@
          *
          * @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);
             }