Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix potential NPE when preference is null"

Browse Source
This commit is contained in:
Tsung-Mao Fang
2022-10-18 06:51:17 +00:00
committed by Gerrit Code Review
parent 624fe54fb3 3b12be137d
commit 2b6a72ba1f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java
View File

@@ -41,9 +41,11 @@ public abstract class AbstractPreferenceController {
setVisible(screen, prefKey, true /* visible */); setVisible(screen, prefKey, true /* visible */);
if (this instanceof Preference.OnPreferenceChangeListener) { if (this instanceof Preference.OnPreferenceChangeListener) {
final Preference preference = screen.findPreference(prefKey); final Preference preference = screen.findPreference(prefKey);
if (preference != null) {
preference.setOnPreferenceChangeListener( preference.setOnPreferenceChangeListener(
(Preference.OnPreferenceChangeListener) this); (Preference.OnPreferenceChangeListener) this);
} }
}
} else { } else {
setVisible(screen, prefKey, false /* visible */); setVisible(screen, prefKey, false /* visible */);
} }