Merge "Refactor NetworkScoreAppManager for testing."

am: 512368a22e

Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
This commit is contained in:
Amin Shaikh
2016-12-01 02:11:06 +00:00
committed by android-build-merger
2 changed files with 5 additions and 4 deletions

View File

@@ -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;