Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5e59833 authored by Tsung-Mao Fang's avatar Tsung-Mao Fang Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE when preference is null" am: 2b6a72ba 

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



Change-Id: Ib0f7d5c73cd27c36f68844a9e9d3494dc2421aac
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f56c5cc5 2b6a72ba

packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java

+4 −2
Original line number Diff line number Diff line
@@ -41,9 +41,11 @@ public abstract class AbstractPreferenceController { 
            setVisible(screen, prefKey, true /* visible */);

            if (this instanceof Preference.OnPreferenceChangeListener) {

                final Preference preference = screen.findPreference(prefKey);

                if (preference != null) {

                    preference.setOnPreferenceChangeListener(

                            (Preference.OnPreferenceChangeListener) this);

                }

            }

        } else {

            setVisible(screen, prefKey, false /* visible */);

        }