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

Merge "Ignore non-font resource references in TextView constructor"

Browse Source
This commit is contained in:
Clara Bayarri
2017-03-06 10:40:20 +00:00
committed by Android (Google) Code Review
parent 1363ab3d7b d134b89276
commit e1be1dfbc3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/widget/TextView.java
View File

@@ -877,7 +877,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
case com.android.internal.R.styleable.TextAppearance_fontFamily:
try {
fontTypeface = appearance.getFont(attr);
} catch (UnsupportedOperationException e) {
} catch (UnsupportedOperationException | Resources.NotFoundException e) {
// Expected if it is not a font resource.
}
if (fontTypeface == null) {
@@ -1194,8 +1194,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
case com.android.internal.R.styleable.TextView_fontFamily:
try {
fontTypeface = a.getFont(attr);
} catch (UnsupportedOperationException e) {
// Expected if it is not a font resource.
} catch (UnsupportedOperationException | Resources.NotFoundException e) {
// Expected if it is not a resource reference or if it is a reference to
// another resource type.
}
if (fontTypeface == null) {
fontFamily = a.getString(attr);
@@ -3325,7 +3326,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
String fontFamily = null;
try {
fontTypeface = ta.getFont(R.styleable.TextAppearance_fontFamily);
} catch (UnsupportedOperationException e) {
} catch (UnsupportedOperationException | Resources.NotFoundException e) {
// Expected if it is not a font resource.
}
if (fontTypeface == null) {