summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-09-08 11:26:55 -0700
committerGilles Debunne <debunne@google.com>2010-09-08 11:26:55 -0700
commitd35180cf52d8a84b5bd45a3f6428449bbc0a3283 (patch)
tree4edfb82fff5eb71a008ba3705711f74bc0352b29 /core
parentc0b4f6d30d962d75125628317b5f5ea622531dfe (diff)
downloadframeworks_base-d35180cf52d8a84b5bd45a3f6428449bbc0a3283.zip
frameworks_base-d35180cf52d8a84b5bd45a3f6428449bbc0a3283.tar.gz
frameworks_base-d35180cf52d8a84b5bd45a3f6428449bbc0a3283.tar.bz2
Fix for a memory leak in TextKeyListener.
Open source contribution https://review.source.android.com/#change,16985 Change-Id: Iebf09e147dd26575ca1a3f02180a678583671a68
Diffstat (limited to 'core')
-rw-r--r--core/java/android/text/method/TextKeyListener.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/text/method/TextKeyListener.java b/core/java/android/text/method/TextKeyListener.java
index 5be2a48..09cbbb8 100644
--- a/core/java/android/text/method/TextKeyListener.java
+++ b/core/java/android/text/method/TextKeyListener.java
@@ -246,8 +246,10 @@ public class TextKeyListener extends BaseKeyListener implements SpanWatcher {
private void initPrefs(Context context) {
final ContentResolver contentResolver = context.getContentResolver();
mResolver = new WeakReference<ContentResolver>(contentResolver);
- mObserver = new SettingsObserver();
- contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, mObserver);
+ if (mObserver == null) {
+ mObserver = new SettingsObserver();
+ contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, mObserver);
+ }
updatePrefs(contentResolver);
mPrefsInited = true;