Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 9797a39ad7

Browse Source 
am: f292f23c0c

Change-Id: I5490aab1d5b4845f912c6fcefda76587e09366ea
This commit is contained in:
Sundeep Ghuman
2017-04-26 18:54:10 +00:00
committed by android-build-merger
parent 65fa77889a f292f23c0c
commit 4b49c11d87
2 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -340,15 +340,21 @@ public class WifiSettings extends RestrictedSettingsFragment
mWifiTracker.startTracking();
if (!isUiRestricted() && mWifiManager.isWifiEnabled()) {
setProgressBarVisible(true);
mWifiTracker.forceUpdate();
if (DEBUG) Log.d(TAG, "WifiSettings onStart APs: " + mWifiTracker.getAccessPoints());
getView().removeCallbacks(mUpdateAccessPointsRunnable);
updateAccessPointPreferences();
forceUpdateAPs();
}
}
private void forceUpdateAPs() {
setProgressBarVisible(true);
mWifiTracker.forceUpdate();
if (DEBUG) {
Log.d(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());
}
getView().removeCallbacks(mUpdateAccessPointsRunnable);
updateAccessPointPreferences();
}
/**
* @return new WifiEnabler or null (as overridden by WifiSettingsForSetupWizard)
*/
@@ -661,7 +667,7 @@ public class WifiSettings extends RestrictedSettingsFragment
final int wifiState = mWifiManager.getWifiState();
switch (wifiState) {
case WifiManager.WIFI_STATE_ENABLED:
updateAccessPointsDelayed();
forceUpdateAPs();
break;
case WifiManager.WIFI_STATE_ENABLING: