diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-09-05 13:42:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@cyanogenmod.teamdouche.net> | 2010-09-05 13:42:00 +0000 |
| commit | c98bddaf249866c59acd4fde3620e1ff4e66e619 (patch) | |
| tree | b5aa6550598e6c9b8949b779329d47aa08759d52 | |
| parent | 36470be67d07b37cbb618b0e6a8d2b28ef7b2d9f (diff) | |
| parent | ec02d9b0c6f378d6da336a4808a561a6351fe698 (diff) | |
| download | frameworks_base-c98bddaf249866c59acd4fde3620e1ff4e66e619.zip frameworks_base-c98bddaf249866c59acd4fde3620e1ff4e66e619.tar.gz frameworks_base-c98bddaf249866c59acd4fde3620e1ff4e66e619.tar.bz2 | |
Merge "Memory leak in TextKeyListener." into froyo
| -rw-r--r-- | core/java/android/text/method/TextKeyListener.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/text/method/TextKeyListener.java b/core/java/android/text/method/TextKeyListener.java index 5be2a48..0c12c55 100644 --- a/core/java/android/text/method/TextKeyListener.java +++ b/core/java/android/text/method/TextKeyListener.java @@ -246,8 +246,11 @@ 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; |