commit 947f335c397642be4546e4412681cb94d3625505
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 01 19:38:04 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 01 19:38:04 2017 +0000
tree 408932c7117aedf8906a9126025d02596e95b52d
parent bfc1832985d3ec1df487f0f79529dc37063532c3
parent 6b82605829fa19e5ced928ec16e59a405c585d7b

Merge "Must not use API26 implementation if the methods are not avaialble." into oc-support-26.0-dev

compat/java/android/support/v4/graphics/TypefaceCompatApi26Impl.java

diff --git a/compat/java/android/support/v4/graphics/TypefaceCompatApi26Impl.java b/compat/java/android/support/v4/graphics/TypefaceCompatApi26Impl.java
index b217c00..c7066c8 100644
--- a/compat/java/android/support/v4/graphics/TypefaceCompatApi26Impl.java
+++ b/compat/java/android/support/v4/graphics/TypefaceCompatApi26Impl.java
@@ -284,7 +284,7 @@
     public Typeface createFromResourcesFontFile(
             Context context, Resources resources, int id, String path, int style) {
         if (!isFontFamilyPrivateAPIAvailable()) {
-            super.createFromResourcesFontFile(context, resources, id, path, style);
+            return super.createFromResourcesFontFile(context, resources, id, path, style);
         }
         Object fontFamily = newFamily();
         if (!addFontFromAssetManager(context, fontFamily, path,