commit 76ed3e5344ed09afc25f6f23e1f7765a6643f0db
author Sundeep Ghuman <sghuman@google.com> Thu Apr 20 20:45:32 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 20 20:45:33 2017 +0000
tree 799bc1143644c97dad6e9d7966806e5e7837adcc
parent d6d61851670cb189f718a5265763f4275b554314
parent b2bdc8f17b6148495731e4bfdd9968a6840907eb

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

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

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index a87bd19..66e8c54 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -340,19 +340,13 @@
         mWifiTracker.startTracking();
 
         if (!isUiRestricted() && mWifiManager.isWifiEnabled()) {
-            forceUpdateAPs();
-        }
-    }
+            setProgressBarVisible(true);
+            mWifiTracker.forceUpdate();
+            if (DEBUG) Log.d(TAG, "WifiSettings onStart APs: " + mWifiTracker.getAccessPoints());
 
-    private void forceUpdateAPs() {
-        setProgressBarVisible(true);
-        mWifiTracker.forceUpdate();
-        if (DEBUG) {
-            Log.d(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());
+            getView().removeCallbacks(mUpdateAccessPointsRunnable);
+            updateAccessPointPreferences();
         }
-
-        getView().removeCallbacks(mUpdateAccessPointsRunnable);
-        updateAccessPointPreferences();
     }
 
     /**
@@ -667,7 +661,7 @@
         final int wifiState = mWifiManager.getWifiState();
         switch (wifiState) {
             case WifiManager.WIFI_STATE_ENABLED:
-                forceUpdateAPs();
+                updateAccessPointsDelayed();
                 break;
 
             case WifiManager.WIFI_STATE_ENABLING: