From fb643dc4b57f91d51240dabc42d37e4be820bdbd Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 19 Dec 2018 18:57:12 +0000
Subject: [PATCH] Revert "Revert "Fix test case fail""

This reverts commit 75261d01dfe443238a118ba92853ec0d0519710b.

Reason for revert: roll forward

Change-Id: I0b66ba4ea918baf54ae084f6281c172a07b160b2
---
 .../settings/core/InstrumentedPreferenceFragment.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index cafef00cf6f..f5f245fad66 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -22,6 +22,7 @@ import android.text.TextUtils;
 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 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
         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();
     }