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

Commit 63f7f5cd authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Remove poor connection UI with watchdog disabled" into jb-dev

parents 2bcca59f 8f5463dd

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

+9 −3
Original line number Diff line number Diff line
@@ -73,11 +73,17 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment 
                Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);

        notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());



        CheckBoxPreference watchdogEnabled =

        boolean watchdogEnabled = Secure.getInt(getContentResolver(),

                Secure.WIFI_WATCHDOG_ON, 1) != 0;

        CheckBoxPreference watchdog =

            (CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG);

        if (watchdogEnabled != null) {

            watchdogEnabled.setChecked(Secure.getInt(getContentResolver(),

        if (watchdog != null) {

            if (watchdogEnabled) {

                watchdog.setChecked(Secure.getInt(getContentResolver(),

                        Secure.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED, 1) == 1);

            } else {

                getPreferenceScreen().removePreference(watchdog);

            }

        }



        ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);