PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 83d31ad4: am 7d10591a: Fix NPE in advanced settings

Browse Source 
* commit '83d31ad497877ca604794f4e6895af487015f9b8':
  Fix NPE in advanced settings
This commit is contained in:
Irfan Sheriff
2011-12-07 12:15:16 -08:00
committed by Android Git Automerger
parent 17045e2f1e 83d31ad497
commit 5779fb75e5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/AdvancedWifiSettings.java
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);