am e3744c8: Fix ANR caused by registering multiple listeners in DateTime

Merge commit 'e3744c8c8a4546b43d024ced6d25b2408da05f27'

* commit 'e3744c8c8a4546b43d024ced6d25b2408da05f27':
  Fix ANR caused by registering multiple listeners in DateTimeSettings.onCreate().
This commit is contained in:
Jim Miller
2009-05-08 13:40:16 -07:00
committed by The Android Open Source Project

View File

@@ -109,14 +109,14 @@ public class DateTimeSettings
mTimePref.setEnabled(!autoEnabled); mTimePref.setEnabled(!autoEnabled);
mDatePref.setEnabled(!autoEnabled); mDatePref.setEnabled(!autoEnabled);
mTimeZone.setEnabled(!autoEnabled); mTimeZone.setEnabled(!autoEnabled);
getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
((CheckBoxPreference)mTime24Pref).setChecked(is24Hour()); ((CheckBoxPreference)mTime24Pref).setChecked(is24Hour());
@@ -134,6 +134,7 @@ public class DateTimeSettings
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
unregisterReceiver(mIntentReceiver); unregisterReceiver(mIntentReceiver);
getPreferenceScreen().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
} }
private void updateTimeAndDateDisplay() { private void updateTimeAndDateDisplay() {