am 728b6316: am 91b5fab9: Merge "Check if the Activity is finishing before showDialog()"

* commit '728b631653bfe5b9f69ad9c3d94819f06aa0f5fc':
  Check if the Activity is finishing before showDialog()

src/com/android/settings/accounts/AccountSyncSettings.java

@@ -115,7 +115,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();