summaryrefslogtreecommitdiff
path: root/src/com/android/contacts/vcard
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2012-09-18 17:16:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-18 17:16:49 -0700
commit6dc1d72d38c893a8b938da351c6c954f8ecb8db6 (patch)
tree0bcfce0bcfcb2fb1ac5eac491b5010f5dc0077be /src/com/android/contacts/vcard
parentcdc279de45da459b359254777a09ab630ce60fa9 (diff)
parent83e32f7e91199b41c61a9f287ebbaa50c89f7c2f (diff)
downloadContacts-6dc1d72d38c893a8b938da351c6c954f8ecb8db6.tar.gz
am 83e32f7e: am 80ad6b43: Merge "Fix BadTokenException crash by ImportVCardActivity" into jb-mr1-dev
* commit '83e32f7e91199b41c61a9f287ebbaa50c89f7c2f': Fix BadTokenException crash by ImportVCardActivity
Diffstat (limited to 'src/com/android/contacts/vcard')
-rw-r--r--src/com/android/contacts/vcard/ImportVCardActivity.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
index a9566ef8c..9af2d527c 100644
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -760,9 +760,11 @@ public class ImportVCardActivity extends ContactsActivity {
runOnUiThread(new Runnable() {
@Override
public void run() {
- mVCardCacheThread = new VCardCacheThread(uris);
- mListener = new NotificationImportExportListener(ImportVCardActivity.this);
- showDialog(R.id.dialog_cache_vcard);
+ if (!isFinishing()) {
+ mVCardCacheThread = new VCardCacheThread(uris);
+ mListener = new NotificationImportExportListener(ImportVCardActivity.this);
+ showDialog(R.id.dialog_cache_vcard);
+ }
}
});
}