diff options
| author | Chris Banes <chrisbanes@google.com> | 2015-07-01 07:58:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-01 07:58:05 +0000 |
| commit | 2bc8485ba79cf6fa95f80b105ed914d245178a0c (patch) | |
| tree | ff98d438803e14efe9cece42bd1bd2e3990a96d9 | |
| parent | 8a752abe77a4387bbe099befa972870ee0a48bbf (diff) | |
| parent | c8f6ecc265656cdf68d2010a4e04666017c3b907 (diff) | |
| download | frameworks_base-2bc8485ba79cf6fa95f80b105ed914d245178a0c.zip frameworks_base-2bc8485ba79cf6fa95f80b105ed914d245178a0c.tar.gz frameworks_base-2bc8485ba79cf6fa95f80b105ed914d245178a0c.tar.bz2 | |
Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev
| -rw-r--r-- | core/java/android/view/ActionProvider.java | 8 | ||||
| -rw-r--r-- | core/java/com/android/internal/view/menu/MenuItemImpl.java | 2 |
2 files changed, 9 insertions, 1 deletions
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 @@ public abstract class ActionProvider { } /** + * @hide + */ + public void reset() { + mVisibilityListener = null; + mSubUiVisibilityListener = null; + } + + /** * @hide Internal use only */ public interface SubUiVisibilityListener { 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 final class MenuItemImpl implements MenuItem { public MenuItem setActionProvider(ActionProvider actionProvider) { if (mActionProvider != null) { - mActionProvider.setVisibilityListener(null); + mActionProvider.reset(); } mActionView = null; mActionProvider = actionProvider; |