am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.

* commit '6ef6f183e4d8be0828d1a969178a6e315d8a0ea7':
  Stability fixes for Settings. Asynchronous callbacks causing NPEs.
This commit is contained in:
Amith Yamasani
2011-06-14 15:41:00 -07:00
committed by Android Git Automerger

View File

@@ -230,6 +230,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
} }
private void setBackgroundDataInt(boolean enabled) { private void setBackgroundDataInt(boolean enabled) {
if (getActivity() == null) return;
final ConnectivityManager connManager = (ConnectivityManager) final ConnectivityManager connManager = (ConnectivityManager)
getActivity().getSystemService(Context.CONNECTIVITY_SERVICE); getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
connManager.setBackgroundDataSetting(enabled); connManager.setBackgroundDataSetting(enabled);
@@ -315,6 +316,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
@Override @Override
public void onAccountsUpdated(Account[] accounts) { public void onAccountsUpdated(Account[] accounts) {
if (getActivity() == null) return;
mManageAccountsCategory.removeAll(); mManageAccountsCategory.removeAll();
for (int i = 0, n = accounts.length; i < n; i++) { for (int i = 0, n = accounts.length; i < n; i++) {
final Account account = accounts[i]; final Account account = accounts[i];