Merge "Refactor NetworkScoreAppManager for testing."
am: 512368a22e
Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
diff --git a/src/com/android/settings/ActiveNetworkScorerDialog.java b/src/com/android/settings/ActiveNetworkScorerDialog.java
index d440c96..ae04b58 100644
--- a/src/com/android/settings/ActiveNetworkScorerDialog.java
+++ b/src/com/android/settings/ActiveNetworkScorerDialog.java
@@ -75,13 +75,14 @@
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 077d601..2b32a09 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -121,7 +121,7 @@
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 @@
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;