am 80cc0ffa: am e7f7643c: am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.
* commit '80cc0ffa2b284aee595c45f8f4142f615486f797':
Stability fixes for Settings. Asynchronous callbacks causing NPEs.
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];