ContactsCommon: Fix ANR error when cancel import contacts action

The ImportVCardActivity isn't finished while user cancelled
import contacts action.

Finish the ImportVCardActivity when user cancel import contacts
action.

CRs-Fixed: 738754

Change-Id: Ib53084cc3055432bb482cc3fb6f3df43b1c3b3b0

1 files changed, 8 insertions, 0 deletions

diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
index faed0d8e..04705054 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
@@ -909,6 +909,13 @@ public class ImportVCardActivity extends Activity {
             });
 
             AlertDialog dialog = builder.create();
+            dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+                @Override
+                public void onCancel(DialogInterface dialog) {
+                    mSelectedStorage = VCardService.INVALID_PATH;
+                    finish();
+                }
+            });
             dialog.setButton(DialogInterface.BUTTON_POSITIVE, getString(android.R.string.ok),
                     new DialogInterface.OnClickListener() {
                         @Override
@@ -921,6 +928,7 @@ public class ImportVCardActivity extends Activity {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             mSelectedStorage = VCardService.INVALID_PATH;
+                            finish();
                         }
                     });
             dialog.show();