commit 73e70721b0c4f69830a93ca16e8b56d5514d8250
author Amith Yamasani <yamasani@google.com> Wed Dec 15 09:58:15 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 15 09:58:15 2010 -0800
tree 7e87e0ff2dc977b5c4ff970a695ece34a1aad324
parent 59f309cf4a9f065bbc0d39dfcff455b5488f3704
parent c948b16e732d0cb5868acfc7fa8d09e3fa083f3c

Merge "Fix an NPE for monkey stability."

src/com/android/settings/accounts/ManageAccountsSettings.java

diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 4efe62b..d769cdb 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -231,6 +231,8 @@
     }
 
     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);