commit de1e019d56d364315188d8f5fbb285e972f86eab
author Seigo Nonaka <nona@google.com> Mon May 10 00:37:40 2021 -0700
committer Seigo Nonaka <nona@google.com> Mon May 10 00:38:17 2021 -0700
tree 8fd00df44b631904a5e71d0f7ee396bcbf2456cc
parent 048fc0ae1a0b8d4707b7c836e0e03fc31c4d97be

Update usage of FontCollection interfaces.

Bug: 187358499
Test: m
Change-Id: I2b1f001b3ebf7c297dae422c730d7052894e4394

native/android/system_fonts.cpp

diff --git a/native/android/system_fonts.cpp b/native/android/system_fonts.cpp
index 60b0f1e..9fe7929 100644
--- a/native/android/system_fonts.cpp
+++ b/native/android/system_fonts.cpp
@@ -329,7 +329,9 @@
                 static_cast<minikin::FamilyVariant>(matcher->mFamilyVariant),
                 1  /* maxRun */);
 
-    const std::shared_ptr<minikin::Font>& font = runs[0].fakedFont.font;
+    const std::shared_ptr<minikin::Font>& font =
+            fc->getBestFont(minikin::U16StringPiece(text, textLength), runs[0], matcher->mFontStyle)
+                    .font;
     std::unique_ptr<AFont> result = std::make_unique<AFont>();
     const android::MinikinFontSkia* minikinFontSkia =
             reinterpret_cast<android::MinikinFontSkia*>(font->typeface().get());