Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NullPointerException in UpdatableFontDir.

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

Change-Id: Ida60723e577f225e63f86dc48e9719c0d725412f
This commit is contained in:
Kohsuke Yatoh
2021-04-30 15:03:55 -07:00
parent 2fef6def9a
commit 3a83bef009
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java
View File

@@ -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() {