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" am: 2b6a72ba1f am: b5e5983379

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2256881

Change-Id: I38a063882089a767732f748e851f5cbedd1e6cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tsung-Mao Fang
2022-10-18 07:45:57 +00:00
committed by Automerger Merge Worker
parent fd21e3a4bd b5e5983379
commit e754249f83
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 */);