am 480fcb24: am 6a2b1a44: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev

* commit '480fcb2432c6a1d0615eacdf50b144ce5e435dae':
  Fixed a bug were AdvanceWifiSettings would crash on resume.
This commit is contained in:
PauloftheWest
2014-08-18 20:15:03 +00:00
committed by Android Git Automerger

View File

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