diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-04-28 05:48:37 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-28 05:48:37 -0700 |
| commit | 6e3326a743fd46d29849e19f168e3c8371df8cd6 (patch) | |
| tree | 8c70657e1682d2cdb4fcd466cc97b2ea53247cba /src | |
| parent | ae2c45e3d4a74c643a01814edc8482a23f74058a (diff) | |
| parent | 43974d40d65e9a0af44adaff64d7a7738e8dd2ad (diff) | |
| download | packages_apps_Settings-6e3326a743fd46d29849e19f168e3c8371df8cd6.zip packages_apps_Settings-6e3326a743fd46d29849e19f168e3c8371df8cd6.tar.gz packages_apps_Settings-6e3326a743fd46d29849e19f168e3c8371df8cd6.tar.bz2 | |
Merge "Check if the Activity is finishing before showDialog()" into cm-10.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/accounts/AccountSyncSettings.java | 3 |
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(); |