diff --git a/core/java/com/android/internal/app/ToolbarActionBar.java b/core/java/com/android/internal/app/ToolbarActionBar.java index 34b9dcb9366f7..2b162af6c7efa 100644 --- a/core/java/com/android/internal/app/ToolbarActionBar.java +++ b/core/java/com/android/internal/app/ToolbarActionBar.java @@ -83,7 +83,9 @@ public class ToolbarActionBar extends ActionBar { @Override public void setCustomView(View view, LayoutParams layoutParams) { - view.setLayoutParams(layoutParams); + if (view != null) { + view.setLayoutParams(layoutParams); + } mDecorToolbar.setCustomView(view); }