diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-10-16 13:40:17 +0800 |
|---|---|---|
| committer | Xiaojing Zhang <zhangx@codeaurora.org> | 2014-11-04 20:34:28 -0800 |
| commit | ef656e14c9094d2b8c2d93121304c3228afa0897 (patch) | |
| tree | 93e4b23d38ca6603ca0f652256f9c0041f42e976 | |
| parent | 3487f890b1689df6eb40e8ce85e2fd6a697a22b9 (diff) | |
| download | android_packages_apps_ContactsCommon-ef656e14c9094d2b8c2d93121304c3228afa0897.tar.gz android_packages_apps_ContactsCommon-ef656e14c9094d2b8c2d93121304c3228afa0897.tar.bz2 android_packages_apps_ContactsCommon-ef656e14c9094d2b8c2d93121304c3228afa0897.zip | |
ContactsCommon: Fix import vCard from external storage.
Add the selected storage patch to import the vCard file.
CRs-Fixed: 728594
Change-Id: Ieb7b1f51a7502886bc9911944cbb757b6aa078da
| -rw-r--r-- | src/com/android/contacts/common/vcard/ImportVCardActivity.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java index ecd74df6..faed0d8e 100644 --- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java +++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java @@ -1050,7 +1050,21 @@ public class ImportVCardActivity extends Activity { */ private void doScanExternalStorageAndImportVCard() { // TODO: should use getExternalStorageState(). - final File file = Environment.getExternalStorageDirectory(); + Log.i(LOG_TAG, "Import Vcard from path:" + mSelectedStorage); + if (mSelectedStorage == VCardService.INVALID_PATH) + return; + File file; + switch (mSelectedStorage) { + case VCardService.INTERNAL_PATH: + file = Environment.getExternalStorageDirectory(); + break; + case VCardService.EXTERNAL_PATH: + file = new File(MoreContactUtils.getSDPath(this)); + break; + default: + file = Environment.getExternalStorageDirectory(); + break; + } if (!file.exists() || !file.isDirectory() || !file.canRead()) { showDialog(R.id.dialog_sdcard_not_found); } else { |