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

This commit is contained in:
PauloftheWest
2014-08-18 20:00:11 +00:00
committed by Android (Google) Code Review

View File

@@ -135,7 +135,9 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
wifiAssistant.setOnPreferenceChangeListener(this); wifiAssistant.setOnPreferenceChangeListener(this);
wifiAssistant.setChecked(checked); wifiAssistant.setChecked(checked);
} else { } else {
getPreferenceScreen().removePreference(wifiAssistant); if (wifiAssistant != null) {
getPreferenceScreen().removePreference(wifiAssistant);
}
} }
Intent wifiDirectIntent = new Intent(context, Intent wifiDirectIntent = new Intent(context,