commit 727ce8ec666b91dfcb67b9ba420fb1a27f70f06f
author Aurimas Liutikas <aurimas@google.com> Wed Dec 19 22:41:46 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 19 22:41:46 2018 +0000
tree 20c9af29dc93402055de697439dc1502a5552915
parent 347829525c1341f93461e9c3e40e45f74f15de4a
parent fb643dc4b57f91d51240dabc42d37e4be820bdbd

Merge "Revert "Revert "Fix test case fail"""

src/com/android/settings/core/InstrumentedPreferenceFragment.java

diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index cafef00..f5f245f 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -22,6 +22,7 @@
 import android.util.Log;
 
 import androidx.annotation.XmlRes;
+import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.overlay.FeatureFactory;
@@ -78,6 +79,14 @@
         updateActivityTitleWithScreenTitle(getPreferenceScreen());
     }
 
+    @Override
+    public <T extends Preference> T findPreference(CharSequence key) {
+        if (key == null) {
+            return null;
+        }
+        return super.findPreference(key);
+    }
+
     protected final Context getPrefContext() {
         return getPreferenceManager().getContext();
     }