am 7d10591a: Fix NPE in advanced settings

* commit '7d10591a3b3c05019260d11f196a5ad742d3685d':
  Fix NPE in advanced settings
This commit is contained in:
Irfan Sheriff
2011-12-07 12:12:59 -08:00
committed by Android Git Automerger

View File

@@ -75,11 +75,13 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
CheckBoxPreference watchdogEnabled = CheckBoxPreference watchdogEnabled =
(CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG); (CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG);
watchdogEnabled.setChecked(Secure.getInt(getContentResolver(), if (watchdogEnabled != null) {
Secure.WIFI_WATCHDOG_ON, 1) == 1); watchdogEnabled.setChecked(Secure.getInt(getContentResolver(),
Secure.WIFI_WATCHDOG_ON, 1) == 1);
//TODO: Bring this back after changing watchdog behavior //TODO: Bring this back after changing watchdog behavior
getPreferenceScreen().removePreference(watchdogEnabled); getPreferenceScreen().removePreference(watchdogEnabled);
}
ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND); ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);