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

Fix potential NPE when preference is null

Browse Source 
findPreference is a nullable method so we need a null-check before calling its method.

Bug: 253904634
Test: atest
Change-Id: I497ba76a61b19bab9602849f1aef725829193ff2
This commit is contained in:
Shen Lin
2022-10-17 09:43:24 +08:00
parent d01036ee58
commit 3b12be137d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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