summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/accounts
diff options
context:
space:
mode:
authorTony Guo <tony.guo@sonyericsson.com>2012-06-27 10:58:04 +0800
committerDvTonder <david.vantonder@gmail.com>2013-04-28 08:41:38 -0400
commit43974d40d65e9a0af44adaff64d7a7738e8dd2ad (patch)
treeec0d2aa865c837da5ea85e76eeed6ed17a13ccbc /src/com/android/settings/accounts
parentcf2b8eaaa3d878714808aa1c7f6898e1f4b8d67c (diff)
downloadpackages_apps_settings-43974d40d65e9a0af44adaff64d7a7738e8dd2ad.zip
packages_apps_settings-43974d40d65e9a0af44adaff64d7a7738e8dd2ad.tar.gz
packages_apps_settings-43974d40d65e9a0af44adaff64d7a7738e8dd2ad.tar.bz2
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
Diffstat (limited to 'src/com/android/settings/accounts')
-rw-r--r--src/com/android/settings/accounts/AccountSyncSettings.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index c346017..a3197f0 100644
--- 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();