commit 73df1a9894886da01a9bba352d9df9e7f2b91a7d
author Jason Monk <jmonk@google.com> Mon Nov 30 14:50:40 2015 -0500
committer Jason Monk <jmonk@google.com> Mon Nov 30 14:50:40 2015 -0500
tree edc4c54b9e700d9c70359d4f08d236acb417eed8
parent 1258c4f434c9230b09e1804773e394882feee057

Guard against monkey crash.

Bug: 25813437
Change-Id: Id86c775b235ee303dc05c1cf70a407bf5472b17c

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

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 490529a..74d3e51 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -523,6 +523,9 @@
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference instanceof AccessPointPreference) {
             mSelectedAccessPoint = ((AccessPointPreference) preference).getAccessPoint();
+            if (mSelectedAccessPoint == null) {
+                return false;
+            }
             /** Bypass dialog for unsecured, unsaved, and inactive networks */
             if (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE &&
                     !mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {