Merge "Unregister the listener in onStop() instead of onDestroy()"
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index d769cdb..0b472ea 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -96,11 +96,16 @@
super.onCreate(icicle);
addPreferencesFromResource(R.xml.manage_accounts_settings);
- AccountManager.get(getActivity()).addOnAccountsUpdatedListener(this, null, true);
setHasOptionsMenu(true);
}
@Override
+ public void onStart() {
+ super.onStart();
+ AccountManager.get(getActivity()).addOnAccountsUpdatedListener(this, null, true);
+ }
+
+ @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.manage_accounts_screen, container, false);
@@ -130,9 +135,9 @@
}
@Override
- public void onDestroy() {
+ public void onStop() {
+ super.onStop();
AccountManager.get(getActivity()).removeOnAccountsUpdatedListener(this);
- super.onDestroy();
}
@Override