commit 2bc8485ba79cf6fa95f80b105ed914d245178a0c
author Chris Banes <chrisbanes@google.com> Wed Jul 01 07:58:00 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 01 07:58:05 2015 +0000
tree ff98d438803e14efe9cece42bd1bd2e3990a96d9
parent 8a752abe77a4387bbe099befa972870ee0a48bbf
parent c8f6ecc265656cdf68d2010a4e04666017c3b907

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

core/java/android/view/ActionProvider.java

diff --git a/core/java/android/view/ActionProvider.java b/core/java/android/view/ActionProvider.java
index c3aafde..752240f 100644
--- a/core/java/android/view/ActionProvider.java
+++ b/core/java/android/view/ActionProvider.java
@@ -237,6 +237,14 @@
     }
 
     /**
+     * @hide
+     */
+    public void reset() {
+        mVisibilityListener = null;
+        mSubUiVisibilityListener = null;
+    }
+
+    /**
      * @hide Internal use only
      */
     public interface SubUiVisibilityListener {

core/java/com/android/internal/view/menu/MenuItemImpl.java

diff --git a/core/java/com/android/internal/view/menu/MenuItemImpl.java b/core/java/com/android/internal/view/menu/MenuItemImpl.java
index 3b1f20d..08d4e86 100644
--- 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 MenuItem setActionProvider(ActionProvider actionProvider) {
         if (mActionProvider != null) {
-            mActionProvider.setVisibilityListener(null);
+            mActionProvider.reset();
         }
         mActionView = null;
         mActionProvider = actionProvider;