From 3a83bef009b2942ea2d61e7750faadb0ae8b6db5 Mon Sep 17 00:00:00 2001
From: Kohsuke Yatoh <kyatoh@google.com>
Date: Fri, 30 Apr 2021 15:03:55 -0700
Subject: [PATCH] Fix NullPointerException in UpdatableFontDir.

The localeList param is @NonNull in FontConfig.FontFamily ctor.
Bug: 186891684
Test: manual

Change-Id: Ida60723e577f225e63f86dc48e9719c0d725412f
---
 .../com/android/server/graphics/fonts/UpdatableFontDir.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java b/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
index 38d1aab705509..cdaea30089fd7 100644
--- a/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
+++ b/services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
@@ -24,6 +24,7 @@ import android.graphics.fonts.FontManager;
 import android.graphics.fonts.FontUpdateRequest;
 import android.graphics.fonts.SystemFonts;
 import android.os.FileUtils;
+import android.os.LocaleList;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.text.FontConfig;
@@ -530,7 +531,7 @@ final class UpdatableFontDir {
                     font.getFontStyle(), font.getIndex(), font.getFontVariationSettings(), null));
         }
         return new FontConfig.FontFamily(resolvedFonts, fontFamily.getName(),
-                null, FontConfig.FontFamily.VARIANT_DEFAULT);
+                LocaleList.getEmptyLocaleList(), FontConfig.FontFamily.VARIANT_DEFAULT);
     }
 
     Map<String, File> getPostScriptMap() {