diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-04-24 11:53:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-24 11:53:31 -0700 |
| commit | 5132e5d81526d065ef4aeb931a77ad7275b634c1 (patch) | |
| tree | 670a365b7001e5b0a1a47bbce3bc26b5cf81bebf /src | |
| parent | a20ec538e5bed0e629b0930494cb793940d21eec (diff) | |
| parent | 9da80a90bec430c52f78d6a951687a208d311d9e (diff) | |
| download | packages_apps_Settings-5132e5d81526d065ef4aeb931a77ad7275b634c1.zip packages_apps_Settings-5132e5d81526d065ef4aeb931a77ad7275b634c1.tar.gz packages_apps_Settings-5132e5d81526d065ef4aeb931a77ad7275b634c1.tar.bz2 | |
Merge "Fix NPE due to delayed event handling."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 3 |
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) { |