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

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();