Merge "Fix test case fail" (085d2b20) · Commits · e / os / android_packages_apps_Settings

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}