Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev

Browse Source 
* commit '2bc8485ba79cf6fa95f80b105ed914d245178a0c':
  Fix memory leak in setActionProvider() - framework edition
This commit is contained in:
Chris Banes
2015-07-01 16:20:23 +00:00
committed by Android Git Automerger
parent 43bb81a8db 2bc8485ba7
commit c981204094
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/view/ActionProvider.java
View File

@@ -236,6 +236,14 @@ public abstract class ActionProvider {
mVisibilityListener = listener;
}
/**
* @hide
*/
public void reset() {
mVisibilityListener = null;
mSubUiVisibilityListener = null;
}
/**
* @hide Internal use only
*/

2
core/java/com/android/internal/view/menu/MenuItemImpl.java
View File

@@ -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;