am d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread

Merge commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp

* commit 'd9c80ab31ac3755141765e2c030bd1404ff0b050':
  Fix for a memory leak in TextKeyListener.
This commit is contained in:
Gilles Debunne
2010-09-08 15:02:20 -07:00
committed by Android Git Automerger

View File

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