Merge "Fix monkey crash" into jb-mr2-dev

2013-03-26 21:17:55 +00:00
parent c64fad3917 ca8e9cd383
commit 61c30fe2d1
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,9 +953,11 @@ public class WifiSettings extends SettingsPreferenceFragment
        if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
            forget();
        } else if (button == WifiDialog.BUTTON_SUBMIT) {
+            if (mDialog != null) {
                submit(mDialog.getController());
            }
        }
+    }

    /* package */ void submit(WifiConfigController configController) {