am 26b27cab: Merge "Fix crash in ToolbarActionBar when setting null custom view" into mnc-dev

* commit '26b27cab811e2c91b6e229cf5bfcf5846fb6d094': Fix crash in ToolbarActionBar when setting null custom view
2015-06-16 21:49:37 +00:00
parent 8d58dcc7f1 26b27cab81
commit 749285a238
1 changed files with 3 additions and 1 deletions
--- 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);
    }