From c2cf25685304363bac33387c996e364a0f958434 Mon Sep 17 00:00:00 2001
From: PauloftheWest <paulofthewest@google.com>
Date: Mon, 18 Aug 2014 11:49:09 -0700
Subject: [PATCH] Fixed a bug were AdvanceWifiSettings would crash on resume.

Bug: 17059286
Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5
---
 src/com/android/settings/wifi/AdvancedWifiSettings.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 236aecd17f9..a57097bb421 100644
--- 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,