Merge "Settings observer fail to unregister." am: b92cb6678c am: 6873e19485

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1535665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3d1bb6248061f8e566d6db457ee1ad81e4be116
This commit is contained in:
Treehugger Robot
2020-12-29 06:08:37 +00:00
committed by Automerger Merge Worker

View File

@@ -84,7 +84,10 @@ abstract public class AbstractZenModePreferenceController extends
mScreen = screen;
Preference pref = screen.findPreference(KEY);
if (pref != null) {
mSettingObserver = new SettingObserver(pref);
if (mSettingObserver == null) {
mSettingObserver = new SettingObserver();
}
mSettingObserver.setPreference(pref);
}
}
@@ -128,10 +131,13 @@ abstract public class AbstractZenModePreferenceController extends
private final Uri ZEN_MODE_DURATION_URI = Settings.Secure.getUriFor(
Settings.Secure.ZEN_DURATION);
private final Preference mPreference;
private Preference mPreference;
public SettingObserver(Preference preference) {
public SettingObserver() {
super(new Handler());
}
public void setPreference(Preference preference) {
mPreference = preference;
}