Merge "Memory leak in TextKeyListener."

This commit is contained in:
Romain Guy
2010-09-11 14:03:11 -07:00
committed by Android Code Review

View File

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