[MaterialToolbar] Add null check for logo ConstantState check

Resolves #2708 PiperOrigin-RevId: 449305810 (cherry picked from commit 2ac796f)
material-components · May 25, 2022 · 299c8e1 · 299c8e1
1 parent 0356d7c
commit 299c8e1
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/java/com/google/android/material/internal/ToolbarUtils.java b/lib/java/com/google/android/material/internal/ToolbarUtils.java
@@ -90,12 +90,17 @@ public static ImageView getLogoImageView(@NonNull Toolbar toolbar) {
 
   @Nullable
   private static ImageView getImageView(@NonNull Toolbar toolbar, @Nullable Drawable content) {
+    if (content == null) {
+      return null;
+    }
     for (int i = 0; i < toolbar.getChildCount(); i++) {
       View child = toolbar.getChildAt(i);
       if (child instanceof ImageView) {
         ImageView imageView = (ImageView) child;
-        if (content != null
-            && imageView.getDrawable().getConstantState().equals(content.getConstantState())) {
+        Drawable drawable = imageView.getDrawable();
+        if (drawable != null
+            && drawable.getConstantState() != null
+            && drawable.getConstantState().equals(content.getConstantState())) {
           return imageView;
         }
       }