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

Commit 3ae5e8b2 authored by Chris Banes's avatar Chris Banes Committed by Android (Google) Code Review
Browse files

Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev

parents 1ef23ade 601bb992

core/java/android/app/Activity.java

+3 −0
Original line number Diff line number Diff line
@@ -2075,6 +2075,9 @@ public class Activity extends ContextThemeWrapper 
                    "by the window decor. Do not request Window.FEATURE_ACTION_BAR and set " +

                    "android:windowActionBar to false in your theme to use a Toolbar instead.");

        }

        // Clear out the MenuInflater to make sure that it is valid for the new Action Bar

        mMenuInflater = null;



        ToolbarActionBar tbab = new ToolbarActionBar(toolbar, getTitle(), this);

        mActionBar = tbab;

        mWindow.setCallback(tbab.getWrappedWindowCallback());