PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e am: 3140bb5ace am: 7c8af0aedc

Browse Source 
am: 409f09b15a

Change-Id: I8ce57090a80cb83b12a55ced0f95989a65db8f9d
This commit is contained in:
Amin Shaikh
2016-12-01 02:31:46 +00:00
committed by android-build-merger
parent 1e798ff51f 409f09b15a
commit 0bc81fbd0e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/ActiveNetworkScorerDialog.java
View File

@@ -75,13 +75,14 @@ public final class ActiveNetworkScorerDialog extends AlertActivity implements
Log.i(TAG, "Can only set scorer for owner/system user."); Log.i(TAG, "Can only set scorer for owner/system user.");
return false; return false;
} }
NetworkScorerAppData newScorer = NetworkScorerAppManager.getScorer(this, mNewPackageName); NetworkScorerAppManager networkScorerAppManager = new NetworkScorerAppManager(this);
NetworkScorerAppData newScorer = networkScorerAppManager.getScorer(mNewPackageName);
if (newScorer == null) { if (newScorer == null) {
Log.e(TAG, "New package " + mNewPackageName + " is not a valid scorer."); Log.e(TAG, "New package " + mNewPackageName + " is not a valid scorer.");
return false; return false;
} }
NetworkScorerAppData oldScorer = NetworkScorerAppManager.getActiveScorer(this); NetworkScorerAppData oldScorer = networkScorerAppManager.getActiveScorer();
if (oldScorer != null && TextUtils.equals(oldScorer.mPackageName, mNewPackageName)) { if (oldScorer != null && TextUtils.equals(oldScorer.mPackageName, mNewPackageName)) {
Log.i(TAG, "New package " + mNewPackageName + " is already the active scorer."); Log.i(TAG, "New package " + mNewPackageName + " is already the active scorer.");
// Set RESULT_OK to indicate to the caller that the "switch" was successful. // Set RESULT_OK to indicate to the caller that the "switch" was successful.

4
src/com/android/settings/wifi/ConfigureWifiSettings.java
View File

@@ -121,7 +121,7 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
mWifiAssistantPreference = (AppListSwitchPreference) findPreference(KEY_WIFI_ASSISTANT); mWifiAssistantPreference = (AppListSwitchPreference) findPreference(KEY_WIFI_ASSISTANT);
Collection<NetworkScorerAppManager.NetworkScorerAppData> scorers = Collection<NetworkScorerAppManager.NetworkScorerAppData> scorers =
NetworkScorerAppManager.getAllValidScorers(context); new NetworkScorerAppManager(context).getAllValidScorers();
if (UserManager.get(context).isAdminUser() && !scorers.isEmpty()) { if (UserManager.get(context).isAdminUser() && !scorers.isEmpty()) {
mWifiAssistantPreference.setOnPreferenceChangeListener(this); mWifiAssistantPreference.setOnPreferenceChangeListener(this);
initWifiAssistantPreference(scorers); initWifiAssistantPreference(scorers);
@@ -200,7 +200,7 @@ public class ConfigureWifiSettings extends SettingsPreferenceFragment
if (KEY_WIFI_ASSISTANT.equals(key)) { if (KEY_WIFI_ASSISTANT.equals(key)) {
NetworkScorerAppManager.NetworkScorerAppData wifiAssistant = NetworkScorerAppManager.NetworkScorerAppData wifiAssistant =
NetworkScorerAppManager.getScorer(context, (String) newValue); new NetworkScorerAppManager(context).getScorer((String) newValue);
if (wifiAssistant == null) { if (wifiAssistant == null) {
mNetworkScoreManager.setActiveScorer(null); mNetworkScoreManager.setActiveScorer(null);
return true; return true;