summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/wifi/AdvancedWifiSettings.java
diff options
context:
space:
mode:
authorPauloftheWest <paulofthewest@google.com>2014-08-18 11:49:09 -0700
committerPauloftheWest <paulofthewest@google.com>2014-08-18 11:49:09 -0700
commitc2cf25685304363bac33387c996e364a0f958434 (patch)
treed0a76056a8abb017941c66856c4059a333f6cf42 /src/com/android/settings/wifi/AdvancedWifiSettings.java
parentf14fa7ed4e9c61543a10f081027489558c4bc104 (diff)
downloadpackages_apps_Settings-c2cf25685304363bac33387c996e364a0f958434.zip
packages_apps_Settings-c2cf25685304363bac33387c996e364a0f958434.tar.gz
packages_apps_Settings-c2cf25685304363bac33387c996e364a0f958434.tar.bz2
Fixed a bug were AdvanceWifiSettings would crash on resume.
Bug: 17059286 Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5
Diffstat (limited to 'src/com/android/settings/wifi/AdvancedWifiSettings.java')
-rw-r--r--src/com/android/settings/wifi/AdvancedWifiSettings.java4
1 files changed, 3 insertions, 1 deletions
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 @@ 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,