Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a83bef0 authored by Kohsuke Yatoh's avatar Kohsuke Yatoh
Browse files

Fix NullPointerException in UpdatableFontDir. 

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

Change-Id: Ida60723e577f225e63f86dc48e9719c0d725412f
parent 2fef6def

services/core/java/com/android/server/graphics/fonts/UpdatableFontDir.java

+2 −1
Original line number Diff line number Diff line
@@ -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() {