am 9386b388: Merge "Fix NPE"

* commit '9386b388f6ea29a6aa7558eee13ebfeeab8ae2cb': Fix NPE
2012-02-13 22:35:09 -08:00
parent 8772f66520 9386b388f6
commit 52cc2cd5d3
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -274,8 +274,9 @@ public class WifiConfigController implements TextWatcher,
    void enableSubmitIfAppropriate() {
        Button submit = mConfigUi.getSubmitButton();
        if (submit == null) return;
-        boolean enabled = false;
+        if (mPasswordView == null) return;

+        boolean enabled = false;
        boolean passwordInvalid = false;

        /* Check password invalidity for manual network set up alone */