commit f39a7f78b11758f395e0555e5d9df853c30b80f1
author Adam Powell <adamp@google.com> Fri Mar 05 18:21:04 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 05 18:21:04 2010 -0800
tree d9dd0ddcc3c4aedc4af2f606adc3f03fedafd430
parent 616c3ee12a65696f43e62931631ba092884ad3fd
parent 2d70273673e2f3b83a52dc5baa206a568fe5b3bd

Merge "Added null check for monkey behavior"

src/com/android/settings/wifi/WifiSettings.java

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index e06dcd4..0607b67 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -254,7 +254,7 @@
     public void onClick(DialogInterface dialogInterface, int button) {
         if (button == WifiDialog.BUTTON_FORGET && mSelected != null) {
             forget(mSelected.networkId);
-        } else if (button == WifiDialog.BUTTON_SUBMIT) {
+        } else if (button == WifiDialog.BUTTON_SUBMIT && mDialog != null) {
             WifiConfiguration config = mDialog.getConfig();
 
             if (config == null) {