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

2014-08-18 20:00:11 +00:00
parent 0cad779d3e c2cf256853
commit 6a2b1a44d2
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -135,7 +135,9 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
            wifiAssistant.setOnPreferenceChangeListener(this);
            wifiAssistant.setChecked(checked);
        } else {
-            getPreferenceScreen().removePreference(wifiAssistant);
+            if (wifiAssistant != null) {
+                getPreferenceScreen().removePreference(wifiAssistant);
+            }
        }

        Intent wifiDirectIntent = new Intent(context,