summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorChris Banes <chrisbanes@google.com>2015-07-01 07:58:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-01 07:58:05 +0000
commit2bc8485ba79cf6fa95f80b105ed914d245178a0c (patch)
treeff98d438803e14efe9cece42bd1bd2e3990a96d9 /core/java/android/view
parent8a752abe77a4387bbe099befa972870ee0a48bbf (diff)
parentc8f6ecc265656cdf68d2010a4e04666017c3b907 (diff)
downloadframeworks_base-2bc8485ba79cf6fa95f80b105ed914d245178a0c.zip
frameworks_base-2bc8485ba79cf6fa95f80b105ed914d245178a0c.tar.gz
frameworks_base-2bc8485ba79cf6fa95f80b105ed914d245178a0c.tar.bz2
Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/ActionProvider.java8
1 files changed, 8 insertions, 0 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 {