Merge "Revert "Force update APs when enabling wifi in WifiSettings."" into oc-dev (76ed3e53) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/WifiSettings.java

+6 −12

Original line number	Diff line number	Diff line
		@@ -340,20 +340,14 @@ public class WifiSettings extends RestrictedSettingsFragment
		mWifiTracker.startTracking();

		if (!isUiRestricted() && mWifiManager.isWifiEnabled()) {
		forceUpdateAPs();
		}
		}

		private void forceUpdateAPs() {
		setProgressBarVisible(true);
		mWifiTracker.forceUpdate();
		if (DEBUG) {
		Log.d(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());
		}
		if (DEBUG) Log.d(TAG, "WifiSettings onStart APs: " + mWifiTracker.getAccessPoints());

		getView().removeCallbacks(mUpdateAccessPointsRunnable);
		updateAccessPointPreferences();
		}
		}

		/**
		* @return new WifiEnabler or null (as overridden by WifiSettingsForSetupWizard)
		@@ -667,7 +661,7 @@ public class WifiSettings extends RestrictedSettingsFragment
		final int wifiState = mWifiManager.getWifiState();
		switch (wifiState) {
		case WifiManager.WIFI_STATE_ENABLED:
		forceUpdateAPs();
		updateAccessPointsDelayed();
		break;

		case WifiManager.WIFI_STATE_ENABLING: