From c5ed395e4becec3fbbe6db24522cd69f600a135c Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 15 Jun 2015 14:11:42 -0700
Subject: [PATCH] Fix crash in ToolbarActionBar when setting null custom view

Bug 21291849

Change-Id: I54a4084b2b146ce7fb9dfe92023e9a1ad23f7902
---
 core/java/com/android/internal/app/ToolbarActionBar.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/ToolbarActionBar.java b/core/java/com/android/internal/app/ToolbarActionBar.java
index 34b9dcb9366f..2b162af6c7ef 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);
     }
 
-- 
2.11.0