Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ac900b5 authored by Sundeep Ghuman's avatar Sundeep Ghuman Committed by android-build-merger
Browse files

Merge "Force update APs when enabling wifi in WifiSettings." into oc-dev am: 8025906b 

am: 05f252ec

Change-Id: I77d68fe604e84e16aa545b119be96241b855abf6
parents 41b5a551 05f252ec

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

+12 −6
Original line number Diff line number Diff line
@@ -340,14 +340,20 @@ 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 onStart APs: " + mWifiTracker.getAccessPoints());

        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: