commit 762d2646582c073152a8774c1c6c49e1dc441d2e
author Daisuke Miyakawa <dmiyakawa@google.com> Tue Dec 28 09:22:24 2010 -0800
committer Daisuke Miyakawa <dmiyakawa@google.com> Tue Dec 28 09:22:24 2010 -0800
tree 32f398f723f27a79483648d038021fe8c29922be
parent 1c58c15e7a84b582b7d4d20c26824cabce80bce9

Check null on Wifi setup screen.

Bug: 3313432
Change-Id: Id475dbca81be9e8f9a7d61cda062095358a725c1

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

diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index fa38d62..2ebe87c 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -321,9 +321,11 @@
         }
         // parent.addView(view);
 
-        if (selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
+        if (selectedAccessPoint != null &&
+                selectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
             mStatusText.setText(R.string.wifi_setup_status_unsecured_network);
-        } else if (selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
+        } else if (selectedAccessPoint != null &&
+                selectedAccessPoint.security == AccessPoint.SECURITY_EAP) {
             mStatusText.setText(R.string.wifi_setup_status_eap_not_supported);
         } else {
             mStatusText.setText(R.string.wifi_setup_status_edit_network);