diff options
| author | 2017-07-27 13:09:46 -0700 | |
|---|---|---|
| committer | 2017-07-27 13:09:46 -0700 | |
| commit | 9b58ad6ce05221b977c7cc6f97b94b302309a367 (patch) | |
| tree | 15c23222fed1f127a1af383e1c84f7954527f818 | |
| parent | df33967d197afa09e7ee90b122a05a9985fbfd7a (diff) | |
Stop font loading with restricted context.
Resources.getFont may load other package's font. Stop loading font
resources unless the developer allowed to do so.
Bug: 64115349
Bug: 35763094
Bug: 62813533
Test: bit CtsTextTestCases:android.text.style.cts.TextAppearanceSpanTest
Change-Id: Ifa1b57a70650ba086b38407c0ed5b4048983e7e5
| -rw-r--r-- | core/java/android/text/style/TextAppearanceSpan.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/text/style/TextAppearanceSpan.java b/core/java/android/text/style/TextAppearanceSpan.java index 3a3646b99bdf..c17cfd500827 100644 --- a/core/java/android/text/style/TextAppearanceSpan.java +++ b/core/java/android/text/style/TextAppearanceSpan.java @@ -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); - mTypeface = a.getFont(com.android.internal.R.styleable.TextAppearance_fontFamily); + if (!context.isRestricted() && context.canLoadUnsafeResources()) { + mTypeface = a.getFont(com.android.internal.R.styleable.TextAppearance_fontFamily); + } else { + mTypeface = null; + } if (mTypeface != null) { mFamilyName = null; } else { |