commit b7df4fa0d356540cc28066f89a4fe39fa2d79313
author Jason Monk <jmonk@google.com> Mon Nov 30 20:11:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 30 20:11:20 2015 +0000
tree e471a6abdd2aefbf8491349099297ef5c4e934a6
parent 25a46dbd5ced75256a62f156c552fb01a91ed9e1
parent 73df1a9894886da01a9bba352d9df9e7f2b91a7d

Merge "Guard against monkey crash."

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()) {