Merge "Fix NPE"

This commit is contained in:
Irfan Sheriff
2012-02-13 22:33:14 -08:00
committed by Android (Google) Code Review

View File

@@ -274,8 +274,9 @@ public class WifiConfigController implements TextWatcher,
void enableSubmitIfAppropriate() { void enableSubmitIfAppropriate() {
Button submit = mConfigUi.getSubmitButton(); Button submit = mConfigUi.getSubmitButton();
if (submit == null) return; if (submit == null) return;
boolean enabled = false; if (mPasswordView == null) return;
boolean enabled = false;
boolean passwordInvalid = false; boolean passwordInvalid = false;
/* Check password invalidity for manual network set up alone */ /* Check password invalidity for manual network set up alone */