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

Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev

Browse Source
This commit is contained in:
Jeff Davidson
2014-08-27 18:47:10 +00:00
committed by Android (Google) Code Review
parent 18fbf724aa eadeb11b1b
commit ffb76318f9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/AdvancedWifiSettings.java
View File

@@ -63,6 +63,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
private static final String KEY_WPS_PIN = "wps_pin_entry"; private static final String KEY_WPS_PIN = "wps_pin_entry";
private WifiManager mWifiManager; private WifiManager mWifiManager;
private NetworkScoreManager mNetworkScoreManager;
private IntentFilter mFilter; private IntentFilter mFilter;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() { private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -89,6 +90,8 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
mFilter = new IntentFilter(); mFilter = new IntentFilter();
mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION); mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
mNetworkScoreManager =
(NetworkScoreManager) getSystemService(Context.NETWORK_SCORE_SERVICE);
} }
@Override @Override
@@ -258,7 +261,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
} }
} else if (KEY_WIFI_ASSISTANT.equals(key)) { } else if (KEY_WIFI_ASSISTANT.equals(key)) {
if (((Boolean)newValue).booleanValue() == false) { if (((Boolean)newValue).booleanValue() == false) {
NetworkScorerAppManager.setActiveScorer(context, null); mNetworkScoreManager.setActiveScorer(null);
return true; return true;
} }