commit f79c7af8f21ee06909916a987b6140d8a76eb7d6
author Yao Lu <yaolu@google.com> Thu Nov 17 00:44:12 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 17 00:44:12 2016 +0000
tree c94e823f5ef908f43243079144d10b3cf97d1fed
parent c7427a53c9556a98648882d27be17e3e002429bc
parent 455d082b6a1a570e06ba4d6f740bfb852d3a8be7

Merge "Catch IllegalArgumentException during caching vCard and send feedback" into ub-contactsdialer-h-dev

src/com/android/contacts/common/vcard/ImportVCardActivity.java

diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
index d7b64b4..e5fab4e 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
@@ -290,7 +290,12 @@
             } finally {
                 Log.i(LOG_TAG, "Finished caching vCard.");
                 mWakeLock.release();
-                unbindService(mConnection);
+                try {
+                    unbindService(mConnection);
+                } catch (IllegalArgumentException e) {
+                    FeedbackHelper.sendFeedback(ImportVCardActivity.this, LOG_TAG,
+                            "Cannot unbind service connection", e);
+                }
                 mProgressDialogForCachingVCard.dismiss();
                 mProgressDialogForCachingVCard = null;
                 finish();