From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Sat, 29 Jan 2011 19:55:24 +0000 (-0800)
Subject: Take care of null in Wifi setup.
X-Git-Tag: android-x86-4.4-r1~2432^3~19
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a93196f1;p=android-x86%2Fpackages-apps-Settings.git

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
---

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);