commit 6ef6f183e4d8be0828d1a969178a6e315d8a0ea7
author Amith Yamasani <yamasani@google.com> Tue Jun 14 15:02:46 2011 -0700
committer Amith Yamasani <yamasani@google.com> Tue Jun 14 15:19:14 2011 -0700
tree 99c472ca3a96ce1445e8e9c5adcbecaf7ee9db43
parent d2a6f28fa7ba8189d2a1987129db27fd840fac0f

Stability fixes for Settings. Asynchronous callbacks causing NPEs.

Bug: 4598717
Change-Id: I7f1c5bf6e079bb36301e81085096c5b82615814b

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 0b472ea..06c5ff0 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -230,6 +230,7 @@
     }
 
     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 @@
 
     @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];