From 2b195b433544287e39e00dec4bee535e52e5b49a Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Wed, 31 Mar 2021 09:37:03 +0000
Subject: [PATCH] Revert "[Settings] Support getSystemService(Class<T>)"

Revert submission 1645152-getSystemService(Class<T>)

Reason for revert: Fix JUnit test failure
Reverted Changes:
I1b4812044:[Settings] Convert to getSystemService(Class<T>)
I278951c24:[Settings] Support getSystemService(Class<T>)

Change-Id: I5ca453c30c39d52e772033820f36ad448aeabe9e
---
 src/com/android/settings/SettingsPreferenceFragment.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 14402a791fc..659ada4bd40 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -438,13 +438,6 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
         return getActivity().getSystemService(name);
     }
 
-    /**
-     * Returns the specified system service from the owning Activity.
-     */
-    protected <T> T getSystemService(final Class<T> serviceClass) {
-        return getActivity().getSystemService(serviceClass);
-    }
-
     /**
      * Returns the PackageManager from the owning Activity.
      */