From ae680e3c67e2d2b0a8898850185b38946b94b90c Mon Sep 17 00:00:00 2001
From: PauloftheWest <paulofthewest@google.com>
Date: Tue, 25 Nov 2014 05:16:22 -0800
Subject: [PATCH] Fixed a Wi-Fi dialog crash

Bug: 18498974
Change-Id: I00ba9828c4f15cefd143fc1c92e1c81f43e91c95
---
 src/com/android/settings/wifi/WifiConfigController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index e6dd9c74178..b00faf1d87d 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -307,7 +307,8 @@ public class WifiConfigController implements TextWatcher,
             }
         }
 
-        if (mEdit || (mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
+        if ((mEdit) || (mAccessPoint != null
+                && mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
             mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel));
         }else{
             mConfigUi.setCancelButton(res.getString(R.string.wifi_display_options_done));