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

Commit c5ed395e authored by Adam Powell's avatar Adam Powell
Browse files

Fix crash in ToolbarActionBar when setting null custom view 

Bug 21291849

Change-Id: I54a4084b2b146ce7fb9dfe92023e9a1ad23f7902
parent 417018f2

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

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




    @Override

    @Override

    public void setCustomView(View view, LayoutParams layoutParams) {

    public void setCustomView(View view, LayoutParams layoutParams) {

        if (view != null) {

            view.setLayoutParams(layoutParams);

            view.setLayoutParams(layoutParams);

        }

        mDecorToolbar.setCustomView(view);

        mDecorToolbar.setCustomView(view);

    }

    }