commit 6a2b1a44d2ed5bc0b5025ec62a51662850499d71
author PauloftheWest <paulofthewest@google.com> Mon Aug 18 20:00:11 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 16 04:03:42 2014 +0000
tree 410e5703fc18b123044972e07d885eb9debdfb45
parent 0cad779d3e4d7ef361fa972e54879cd6791b467c
parent c2cf25685304363bac33387c996e364a0f958434

Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev

src/com/android/settings/wifi/AdvancedWifiSettings.java

diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 236aecd..a57097b 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -135,7 +135,9 @@
             wifiAssistant.setOnPreferenceChangeListener(this);
             wifiAssistant.setChecked(checked);
         } else {
-            getPreferenceScreen().removePreference(wifiAssistant);
+            if (wifiAssistant != null) {
+                getPreferenceScreen().removePreference(wifiAssistant);
+            }
         }
 
         Intent wifiDirectIntent = new Intent(context,