ContactsCommon: Fix "Can't import contacts from sd card" issue

The SD card path is set as /storage/uicc0 instead of /storage/sdcard1.
And ImportVCardActivity is finished abnormally when we import vcard file.

Change the SD card judgment method, refer to FileExplorer.
And change dialog OnDismissListener to OnCancelListener.

CRs-Fixed: 649458

Change-Id: Ie3b10cdc7843d94ad02a556fcfdfa0715c1bad7a

2 files changed, 3 insertions, 13 deletions

diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index d85de198..1a3ca011 100644
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -822,7 +822,7 @@ public class MoreContactUtils {
         StorageVolume[] volumes = mStorageManager.getVolumeList();
         for (int i = 0; i < volumes.length; i++) {
             if (volumes[i].isRemovable() && volumes[i].allowMassStorage()
-                    && !volumes[i].isPrimary()) {
+                    && volumes[i].getDescription(context).contains("SD")) {
                 sd = volumes[i].getPath();
             }
         }
diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
index 9bc5c032..c9da6135 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
@@ -950,12 +950,7 @@ public class ImportVCardActivity extends Activity {
             });
 
             AlertDialog dialog = builder.create();
-            dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
-                @Override
-                public void onDismiss(DialogInterface dialog) {
-                    finish();
-                }
-            });
+            dialog.setOnCancelListener(mCancelListener);
             dialog.setButton(DialogInterface.BUTTON_POSITIVE, getString(android.R.string.ok),
                     new DialogInterface.OnClickListener() {
                         @Override
@@ -964,12 +959,7 @@ public class ImportVCardActivity extends Activity {
                         }
                     });
             dialog.setButton(DialogInterface.BUTTON_NEGATIVE, getString(android.R.string.cancel),
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            mSelectedStorage = VCardService.INVALID_PATH;
-                        }
-                    });
+                    mCancelListener);
             dialog.show();
         } else if (inExist) {
             mSelectedStorage = VCardService.INTERNAL_PATH;