commit 26b27cab811e2c91b6e229cf5bfcf5846fb6d094
author Adam Powell <adamp@google.com> Tue Jun 16 21:29:46 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 16 21:29:48 2015 +0000
tree b372601680e6da58daeea9292831cae5fc9e8acf
parent 1c52669d1f35e11feaad52a65507a9c4f1f4c876
parent c5ed395e4becec3fbbe6db24522cd69f600a135c

Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev

core/java/com/android/internal/app/ToolbarActionBar.java

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