am 61c30fe2: Merge "Fix monkey crash" into jb-mr2-dev

* commit '61c30fe2d14573378321d3a8df21ffb14a54e43b': Fix monkey crash
2013-03-26 14:26:06 -07:00
parent 551dd1f8ae 61c30fe2d1
commit 54d4aefe0f
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -953,7 +953,9 @@ public class WifiSettings extends SettingsPreferenceFragment
        if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
            forget();
        } else if (button == WifiDialog.BUTTON_SUBMIT) {
-            submit(mDialog.getController());
+            if (mDialog != null) {
+                submit(mDialog.getController());
+            }
        }
    }