From fec195d7564b489fcdd814d066cfbf6af702132b Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Wed, 7 Dec 2011 11:40:49 -0800 Subject: [PATCH] Fix NPE in advanced settings Bug: 5723974 Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542 --- src/com/android/settings/wifi/AdvancedWifiSettings.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java index fc1b128a41..c213512bbe 100644 --- a/src/com/android/settings/wifi/AdvancedWifiSettings.java +++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java @@ -75,11 +75,13 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment CheckBoxPreference watchdogEnabled = (CheckBoxPreference) findPreference(KEY_ENABLE_WIFI_WATCHDOG); - watchdogEnabled.setChecked(Secure.getInt(getContentResolver(), - Secure.WIFI_WATCHDOG_ON, 1) == 1); + if (watchdogEnabled != null) { + watchdogEnabled.setChecked(Secure.getInt(getContentResolver(), + Secure.WIFI_WATCHDOG_ON, 1) == 1); - //TODO: Bring this back after changing watchdog behavior - getPreferenceScreen().removePreference(watchdogEnabled); + //TODO: Bring this back after changing watchdog behavior + getPreferenceScreen().removePreference(watchdogEnabled); + } ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND); -- 2.11.0