summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-04-24 11:35:38 -0700
committerAmith Yamasani <yamasani@google.com>2012-04-24 11:35:38 -0700
commit9da80a90bec430c52f78d6a951687a208d311d9e (patch)
treed9f63b329d8e4e3479e7175fd57c0be7c7b1a8b8 /src
parente2b33708763e4e04e73fd7e22e15a4eb83516c1a (diff)
downloadpackages_apps_Settings-9da80a90bec430c52f78d6a951687a208d311d9e.zip
packages_apps_Settings-9da80a90bec430c52f78d6a951687a208d311d9e.tar.gz
packages_apps_Settings-9da80a90bec430c52f78d6a951687a208d311d9e.tar.bz2
Fix NPE due to delayed event handling.
a.k.a., annoying monkeys. Bug: 6336430 Change-Id: Ie038a71d0ae66b3f30ccd704529f767fa2058542
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/wifi/WifiSettings.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 04d0220..36bae32 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) {