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

* commit '93af99f21d5499b3d2100951f9238a296043b355': Fix crash in ToolbarActionBar when setting null custom view
2015-06-16 22:17:23 +00:00
parent 8c413428ae 93af99f21d
commit 56ee010cd8
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);
    }