From 6ef6f183e4d8be0828d1a969178a6e315d8a0ea7 Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 14 Jun 2011 15:02:46 -0700
Subject: [PATCH] Stability fixes for Settings. Asynchronous callbacks causing
 NPEs.

Bug: 4598717
Change-Id: I7f1c5bf6e079bb36301e81085096c5b82615814b
---
 src/com/android/settings/accounts/ManageAccountsSettings.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 0b472eaf751..06c5ff0a2bc 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -230,6 +230,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
     }
 
     private void setBackgroundDataInt(boolean enabled) {
+        if (getActivity() == null) return;
         final ConnectivityManager connManager = (ConnectivityManager)
                 getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
         connManager.setBackgroundDataSetting(enabled);
@@ -315,6 +316,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
 
     @Override
     public void onAccountsUpdated(Account[] accounts) {
+        if (getActivity() == null) return;
         mManageAccountsCategory.removeAll();
         for (int i = 0, n = accounts.length; i < n; i++) {
             final Account account = accounts[i];