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

Commit a0615501 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix crash in TextView getFont"

parents 9deb6b5a 06033240

core/java/android/widget/TextView.java

+2 −2
Original line number Diff line number Diff line
@@ -1162,12 +1162,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


                case com.android.internal.R.styleable.TextView_fontFamily:

                    try {

                        fontTypeface = appearance.getFont(attr);

                        fontTypeface = a.getFont(attr);

                    } catch (UnsupportedOperationException e) {

                        // Expected if it is not a font resource.

                    }

                    if (fontTypeface == null) {

                        fontFamily = appearance.getString(attr);

                        fontFamily = a.getString(attr);

                    }

                    fontFamilyExplicit = true;

                    break;