From eadeb11b1b474fd8f318a2f828e7f6e25653cfd5 Mon Sep 17 00:00:00 2001 From: Jeff Davidson Date: Wed, 27 Aug 2014 11:20:09 -0700 Subject: [PATCH] Use NetworkScoreManager when disabling scoring. Otherwise previous scores will not be cleared and the SCORER_CHANGED broadcast will not be sent. Bug: 17299736 Change-Id: I57b0c44a7972d885cf084aacf74829cf7d391dae --- src/com/android/settings/wifi/AdvancedWifiSettings.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index a57097bb42..dfb86ccb96 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -63,6 +63,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment private static final String KEY_WPS_PIN = "wps_pin_entry"; private WifiManager mWifiManager; + private NetworkScoreManager mNetworkScoreManager; private IntentFilter mFilter; private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @@ -89,6 +90,8 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment mFilter = new IntentFilter(); mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION); mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); + mNetworkScoreManager = + (NetworkScoreManager) getSystemService(Context.NETWORK_SCORE_SERVICE); } @Override @@ -258,7 +261,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment } } else if (KEY_WIFI_ASSISTANT.equals(key)) { if (((Boolean)newValue).booleanValue() == false) { - NetworkScorerAppManager.setActiveScorer(context, null); + mNetworkScoreManager.setActiveScorer(null); return true; } -- 2.11.0