From 63c91f0973c64fd6fb2b1654522b9dfee294eda7 Mon Sep 17 00:00:00 2001 From: Tony Guo Date: Wed, 27 Jun 2012 10:58:04 +0800 Subject: [PATCH] Check if the Activity is finishing before showDialog() Check if the Activity is going through its finishing phase before displaying the Dialog, because Showing dialog once the activity is no longer in context will cause BadTokenException. Change-Id: I58940e694f61cd79536abe2df60a0b745a7b806f --- src/com/android/settings/accounts/AccountSyncSettings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 196908e6626..e1ff3986cd3 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -112,7 +112,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();