Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 749285a2 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

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

* commit '26b27cab':
  Fix crash in ToolbarActionBar when setting null custom view
parents 8d58dcc7 26b27cab

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

+3 −1
Original line number Diff line number Diff line
@@ -83,7 +83,9 @@ public class ToolbarActionBar extends ActionBar { 


    @Override

    public void setCustomView(View view, LayoutParams layoutParams) {

        if (view != null) {

            view.setLayoutParams(layoutParams);

        }

        mDecorToolbar.setCustomView(view);

    }