Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev

2015-07-01 07:58:00 +00:00
parent 8a752abe77 c8f6ecc265
commit 2bc8485ba7
2 changed files with 9 additions and 1 deletions
--- a/core/java/android/view/ActionProvider.java
+++ b/core/java/android/view/ActionProvider.java
@@ -236,6 +236,14 @@ public abstract class ActionProvider {
        mVisibilityListener = listener;
    }

+    /**
+     * @hide
+     */
+    public void reset() {
+        mVisibilityListener = null;
+        mSubUiVisibilityListener = null;
+    }
+
    /**
     * @hide Internal use only
     */
--- a/core/java/com/android/internal/view/menu/MenuItemImpl.java
+++ b/core/java/com/android/internal/view/menu/MenuItemImpl.java
@@ -593,7 +593,7 @@ public final class MenuItemImpl implements MenuItem {

    public MenuItem setActionProvider(ActionProvider actionProvider) {
        if (mActionProvider != null) {
-            mActionProvider.setVisibilityListener(null);
+            mActionProvider.reset();
        }
        mActionView = null;
        mActionProvider = actionProvider;