Merge "Check if the Activity is finishing before showDialog()"

2013-04-16 13:13:52 +00:00
parent 3a27171881 63c91f0973
commit 91b5fab9b0
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -114,7 +114,8 @@ public class AccountSyncSettings extends AccountPreferenceBase {
                                } catch (AuthenticatorException e) {
                                    // handled below
                                }
-                                if (failed) {
+                                if (failed && getActivity() != null &&
+                                        !getActivity().isFinishing()) {
                                    showDialog(FAILED_REMOVAL_DIALOG);
                                } else {
                                    finish();