diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-04-16 13:13:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-16 13:13:53 +0000 |
| commit | 91b5fab9b0e8338850fe2838311a0801fddf31d4 (patch) | |
| tree | 7f0d6f0546d20dd9414719b7a6c32b98f3fa2452 /src/com/android/settings/accounts | |
| parent | 3a271718815062c5b904f157a7be9008320a7c37 (diff) | |
| parent | 63c91f0973c64fd6fb2b1654522b9dfee294eda7 (diff) | |
| download | packages_apps_Settings-91b5fab9b0e8338850fe2838311a0801fddf31d4.zip packages_apps_Settings-91b5fab9b0e8338850fe2838311a0801fddf31d4.tar.gz packages_apps_Settings-91b5fab9b0e8338850fe2838311a0801fddf31d4.tar.bz2 | |
Merge "Check if the Activity is finishing before showDialog()"
Diffstat (limited to 'src/com/android/settings/accounts')
| -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(); |