commit 2fa828a951fc4c4843e307944d2923700269aed5
author Maurice Lam <yukl@google.com> Thu Oct 22 19:52:05 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 22 19:52:05 2015 +0000
tree 4a0df26e3b9c57a7648f8e2d98b8b3a2dd010f4a
parent bf103148198b2417c7e8fc536a276407cf6132a1
parent 34e5a0c30881463c10dad399850b78aef775a3a4

Merge "[WifiDialog] Allow adding unspecified AP"

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

diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 6f9e3d3..9eea98a 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -43,7 +43,10 @@
 
         final Intent intent = getIntent();
         final Bundle accessPointState = intent.getBundleExtra(KEY_ACCESS_POINT_STATE);
-        final AccessPoint accessPoint = new AccessPoint(this, accessPointState);
+        AccessPoint accessPoint = null;
+        if (accessPointState != null) {
+            accessPoint = new AccessPoint(this, accessPointState);
+        }
 
         WifiDialog dialog = new WifiDialog(this, this, accessPoint, WifiConfigUiBase.MODE_CONNECT);
         dialog.show();