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

Commit e8149709 authored by Irfan Sheriff's avatar Irfan Sheriff
Browse files

Stop scanning after errors 

When scan fails for 3 times, we show a
failure toast and continue to scan.
In one case this caused infinite toasts,
until the user stopped wifi.

Its not clear what can cause this kind of
a state since wifi disable broadcast should
stop the scans. This fix will stop scans
after 3 continuous failures. Any wifi state
change will restart scan.

Bug: 2601937
Change-Id: I68733394cb3c9b76ffb15f7579e7af6c1f54d39c
parent c02a09aa

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

+4 −1
Original line number Diff line number Diff line
@@ -431,8 +431,10 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface. 


    private void updateConnectionState(DetailedState state) {

        /* sticky broadcasts can call this when wifi is disabled */

        if (!mWifiManager.isWifiEnabled())

        if (!mWifiManager.isWifiEnabled()) {

            mScanner.pause();

            return;

        }



        if (state == DetailedState.OBTAINING_IPADDR) {

            mScanner.pause();
@@ -489,6 +491,7 @@ public class WifiSettings extends PreferenceActivity implements DialogInterface. 
                mRetry = 0;

                Toast.makeText(WifiSettings.this, R.string.wifi_fail_to_scan,

                        Toast.LENGTH_LONG).show();

                return;

            }

            mAccessPoints.setProgress(mRetry != 0);

            sendEmptyMessageDelayed(0, 6000);