From a93196f1651a0598d6e398f6fb3c2e513a3b7091 Mon Sep 17 00:00:00 2001 From: Daisuke Miyakawa Date: Sat, 29 Jan 2011 11:55:24 -0800 Subject: [PATCH] Take care of null in Wifi setup. The preference isn't available in Wifi setup launched from SetupWizard, causing NPE. Bug: 3404998 Change-Id: Ia0dabea95e5e7424698a269c0851d610fd305309 --- src/com/android/settings/wifi/WifiSettings.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 7d1614163e..1222e77d88 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -210,11 +210,13 @@ public class WifiSettings extends SettingsPreferenceFragment mAddNetwork = findPreference("add_network"); ListPreference pref = (ListPreference) findPreference(KEY_SLEEP_POLICY); - pref.setOnPreferenceChangeListener(this); - int value = Settings.System.getInt(getContentResolver(), - Settings.System.WIFI_SLEEP_POLICY, - Settings.System.WIFI_SLEEP_POLICY_NEVER); - pref.setValue(String.valueOf(value)); + if (pref != null) { + pref.setOnPreferenceChangeListener(this); + int value = Settings.System.getInt(getContentResolver(), + Settings.System.WIFI_SLEEP_POLICY, + Settings.System.WIFI_SLEEP_POLICY_NEVER); + pref.setValue(String.valueOf(value)); + } registerForContextMenu(getListView()); setHasOptionsMenu(true); -- 2.11.0