From: Fan Zhang <zhfan@google.com>
Date: Wed, 19 Dec 2018 18:26:10 +0000 (+0000)
Subject: Revert "Fix test case fail"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=75261d01dfe443238a118ba92853ec0d0519710b;p=android-x86%2Fpackages-apps-Settings.git

Revert "Fix test case fail"

This reverts commit 6d387e4a5f7abadf49b787e456ea06532a24875d.

Reason for revert: collateral damage for b/121116425

Change-Id: I3ba716e283bf466ad8603c1d8c64861febec9a8c
---

diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index f5f245fad6..cafef00cf6 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -22,7 +22,6 @@ 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;
@@ -79,14 +78,6 @@ 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();
     }