From c65ea181da71fab4d911da010c7413492104df4d Mon Sep 17 00:00:00 2001
From: Seigo Nonaka <nona@google.com>
Date: Wed, 25 Jan 2017 22:25:10 +0900
Subject: [PATCH] Fix crash with FontProvider

Need to freeze the FontFamily otherwise the FontFamily is not created.

Test: manually done
Change-Id: I81a6f0d295f13bbeb059deafb4283654f97c0090
---
 graphics/java/android/graphics/Typeface.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java
index 7a7c7afb21f1c..38e806134c93a 100644
--- 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}));
     }