Merge "Stop font loading with restricted context." into oc-mr1-dev (06ba486a) · Commits · e / os / android_frameworks_base

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 {