diff --git a/src/com/android/settings/ActiveNetworkScorerDialog.java b/src/com/android/settings/ActiveNetworkScorerDialog.java
index d440c9691a3..ae04b58946f 100644
--- a/src/com/android/settings/ActiveNetworkScorerDialog.java
+++ b/src/com/android/settings/ActiveNetworkScorerDialog.java
@@ -75,13 +75,14 @@ public final class ActiveNetworkScorerDialog extends AlertActivity implements
             Log.i(TAG, "Can only set scorer for owner/system user.");
             return false;
         }
-        NetworkScorerAppData newScorer = NetworkScorerAppManager.getScorer(this, mNewPackageName);
+        NetworkScorerAppManager networkScorerAppManager = new NetworkScorerAppManager(this);
+        NetworkScorerAppData newScorer = networkScorerAppManager.getScorer(mNewPackageName);
         if (newScorer == null) {
             Log.e(TAG, "New package " + mNewPackageName + " is not a valid scorer.");
             return false;
         }
 
-        NetworkScorerAppData oldScorer = NetworkScorerAppManager.getActiveScorer(this);
+        NetworkScorerAppData oldScorer = networkScorerAppManager.getActiveScorer();
         if (oldScorer != null && TextUtils.equals(oldScorer.mPackageName, mNewPackageName)) {
             Log.i(TAG, "New package " + mNewPackageName + " is already the active scorer.");
             // Set RESULT_OK to indicate to the caller that the "switch" was successful.
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index ce27ba9b060..9739ef9e2cb 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -121,7 +121,7 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
 
         mWifiAssistantPreference = (AppListSwitchPreference) findPreference(KEY_WIFI_ASSISTANT);
         Collection<NetworkScorerAppManager.NetworkScorerAppData> scorers =
-                NetworkScorerAppManager.getAllValidScorers(context);
+                new NetworkScorerAppManager(context).getAllValidScorers();
         if (UserManager.get(context).isAdminUser() && !scorers.isEmpty()) {
             mWifiAssistantPreference.setOnPreferenceChangeListener(this);
             initWifiAssistantPreference(scorers);
@@ -200,7 +200,7 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
 
         if (KEY_WIFI_ASSISTANT.equals(key)) {
             NetworkScorerAppManager.NetworkScorerAppData wifiAssistant =
-                    NetworkScorerAppManager.getScorer(context, (String) newValue);
+                    new NetworkScorerAppManager(context).getScorer((String) newValue);
             if (wifiAssistant == null) {
                 mNetworkScoreManager.setActiveScorer(null);
                 return true;