Merge "Fix crash with FontProvider"

2017-01-25 15:01:02 +00:00
parent 07e29ad1ea c65ea181da
commit 5c755d65a3
1 changed files with 1 additions and 0 deletions
--- a/graphics/java/android/graphics/Typeface.java
+++ b/graphics/java/android/graphics/Typeface.java
@@ -237,6 +237,7 @@ public class Typeface {
                IoUtils.closeQuietly(fd);
            }
        }
+        fontFamily.freeze();
        callback.onTypefaceRetrieved(Typeface.createFromFamiliesWithDefault(
                new FontFamily[] {fontFamily}));
    }