PawletOS/app_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

Browse Source 
am: 9797a39ad7

Change-Id: Ic398fbad1492c19db947462d0c54cf9391de58e3
This commit is contained in:
Sundeep Ghuman
2017-04-26 18:45:09 +00:00
committed by android-build-merger
parent 4aad6f98f4 9797a39ad7
commit f292f23c0c
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: