PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings observer fail to unregister.

Browse Source 
Zen mode change will call displayPreference() and create a new SettingsObserver, then the old Observer object will have no opportunity to be unregistered. After too much new SettingsObserver creatd in Monkey test, memory might leak.

Bug 176206489

Change-Id: I3bccec281da492299bbf755f86df7844a31223c5
This commit is contained in:
andrew.gong
2020-12-24 15:32:49 +08:00
parent a2e406ed85
commit bf477db855
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
View File

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