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

Commit 0494dc5d authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "Stop font loading with restricted context." into oc-mr1-dev 

am: 06ba486a

Change-Id: I0c668e01f9fe254b6bedace52d19bd7bcb5d5f1f
parents bc939bbe 06ba486a

core/java/android/text/style/TextAppearanceSpan.java

+5 −1
Original line number Diff line number Diff line
@@ -70,7 +70,11 @@ public class TextAppearanceSpan extends MetricAffectingSpan implements Parcelabl 
                                        TextAppearance_textSize, -1);



        mStyle = a.getInt(com.android.internal.R.styleable.TextAppearance_textStyle, 0);

        if (!context.isRestricted() && context.canLoadUnsafeResources()) {

            mTypeface = a.getFont(com.android.internal.R.styleable.TextAppearance_fontFamily);

        } else {

            mTypeface = null;

        }

        if (mTypeface != null) {

            mFamilyName = null;

        } else {