summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2010-12-15 09:58:15 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-15 09:58:15 -0800
commit73e70721b0c4f69830a93ca16e8b56d5514d8250 (patch)
tree7e87e0ff2dc977b5c4ff970a695ece34a1aad324 /src
parent59f309cf4a9f065bbc0d39dfcff455b5488f3704 (diff)
parentc948b16e732d0cb5868acfc7fa8d09e3fa083f3c (diff)
downloadpackages_apps_Settings-73e70721b0c4f69830a93ca16e8b56d5514d8250.tar.gz
packages_apps_Settings-73e70721b0c4f69830a93ca16e8b56d5514d8250.tar.bz2
packages_apps_Settings-73e70721b0c4f69830a93ca16e8b56d5514d8250.zip
Merge "Fix an NPE for monkey stability."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/accounts/ManageAccountsSettings.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 4efe62be0..d769cdb3a 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -231,6 +231,8 @@ public class ManageAccountsSettings extends AccountPreferenceBase
}
protected void onSyncStateUpdated() {
+ // Catch any delayed delivery of update messages
+ if (getActivity() == null) return;
// Set background connection state
final ConnectivityManager connManager = (ConnectivityManager)
getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);