From 9da80a90bec430c52f78d6a951687a208d311d9e Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Tue, 24 Apr 2012 11:35:38 -0700 Subject: [PATCH] Fix NPE due to delayed event handling. a.k.a., annoying monkeys. Bug: 6336430 Change-Id: Ie038a71d0ae66b3f30ccd704529f767fa2058542 --- src/com/android/settings/wifi/WifiSettings.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 04d0220292e..36bae32040d 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -527,6 +527,9 @@ public class WifiSettings extends SettingsPreferenceFragment * the strength of network and the security for it. */ private void updateAccessPoints() { + // Safeguard from some delayed event handling + if (getActivity() == null) return; + final int wifiState = mWifiManager.getWifiState(); switch (wifiState) {