[TypefaceUtils] Add defensive null check for typeface passed in to util

PiperOrigin-RevId: 465333642
material-components · Aug 4, 2022 · 2b1af84 · 2b1af84
1 parent 276a0a3
commit 2b1af84
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/java/com/google/android/material/resources/TypefaceUtils.java b/lib/java/com/google/android/material/resources/TypefaceUtils.java
@@ -51,7 +51,8 @@ public static Typeface maybeCopyWithFontWeightAdjustment(
       @NonNull Configuration configuration, @NonNull Typeface typeface) {
     if (VERSION.SDK_INT >= VERSION_CODES.S
         && configuration.fontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED
-        && configuration.fontWeightAdjustment != 0) {
+        && configuration.fontWeightAdjustment != 0
+        && typeface != null) {
       int adjustedWeight =
           MathUtils.clamp(
               typeface.getWeight() + configuration.fontWeightAdjustment,