am fff023e5: am 3ae5e8b2: Merge "Fix leak for MenuInflater + setActionBar" into mnc-dev

* commit 'fff023e5d46050e2d9658573c789deed6ad5415b': Fix leak for MenuInflater + setActionBar
2015-06-23 07:29:04 +00:00
parent 0623d63591 fff023e5d4
commit 638b2b0ae2
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -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());