diff options
| author | Gilles Debunne <debunne@google.com> | 2010-09-08 15:50:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 15:50:50 -0700 |
| commit | fd1a8945be5ea1ce5dd948f8fdbefc6c5963eb9f (patch) | |
| tree | 993953127dcbea709f82ba6ae35386521c045af5 /core/java/android/text/method | |
| parent | fa018890643dfc2ccc3a74a223b21dc24b72fa05 (diff) | |
| parent | de5cfcb608f3432d98ae17e0febb6e726df79e90 (diff) | |
| download | frameworks_base-fd1a8945be5ea1ce5dd948f8fdbefc6c5963eb9f.zip frameworks_base-fd1a8945be5ea1ce5dd948f8fdbefc6c5963eb9f.tar.gz frameworks_base-fd1a8945be5ea1ce5dd948f8fdbefc6c5963eb9f.tar.bz2 | |
am de5cfcb6: am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90'
* commit 'de5cfcb608f3432d98ae17e0febb6e726df79e90':
Fix for a memory leak in TextKeyListener.
Diffstat (limited to 'core/java/android/text/method')
| -rw-r--r-- | core/java/android/text/method/TextKeyListener.java | 6 |
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; |