From 762d2646582c073152a8774c1c6c49e1dc441d2e Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Tue, 28 Dec 2010 09:22:24 -0800
Subject: [PATCH] Check null on Wifi setup screen.

Bug: 3313432
Change-Id: Id475dbca81be9e8f9a7d61cda062095358a725c1
---
 .../android/settings/wifi/WifiSettingsForSetupWizardXL.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index fa38d6250ce..2ebe87c1d14 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -321,9 +321,11 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
         }
         // 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);