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

Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev

Browse Source 
am: 76ed3e5344

Change-Id: I7541a423acd06f69fa944a9044a4768e62e76d68
This commit is contained in:
Sundeep Ghuman
2017-04-20 20:52:45 +00:00
committed by android-build-merger
parent 8f68658aef 76ed3e5344
commit e4d80f99a1
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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