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

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

Change-Id: Ib0f7d5c73cd27c36f68844a9e9d3494dc2421aac
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:19:52 +00:00
committed by Automerger Merge Worker
parent f56c5cc599 2b6a72ba1f
commit b5e5983379
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 */);
} }