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: 8025906b7c

Change-Id: Icfe7abd987ad1f4b6a0475904759cc87eb61a00a
This commit is contained in:
Sundeep Ghuman
2017-04-19 21:54:21 +00:00
committed by android-build-merger
parent 0a9fddd631 8025906b7c
commit 05f252ec53
1 changed files with 13 additions and 7 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: