diff options
| author | kaiyiz <kaiyiz@codeaurora.org> | 2014-10-16 13:40:17 +0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-03-22 15:03:03 -0700 |
| commit | c864f8b3f40c141d3c5c0be604931f07995bf369 (patch) | |
| tree | fc9c6aa41f04ded411d58123c608b24c51d0fd25 /src | |
| parent | 750f8a1f562b2db39914be1e8b349a578eed5af7 (diff) | |
| download | android_packages_apps_ContactsCommon-c864f8b3f40c141d3c5c0be604931f07995bf369.tar.gz android_packages_apps_ContactsCommon-c864f8b3f40c141d3c5c0be604931f07995bf369.tar.bz2 android_packages_apps_ContactsCommon-c864f8b3f40c141d3c5c0be604931f07995bf369.zip | |
ContactsCommon: Fix import vCard from external storage.
Add the selected storage patch to import the vCard file.
CRs-Fixed: 728594
Change-Id: Ieb7b1f51a7502886bc9911944cbb757b6aa078da
Diffstat (limited to 'src')
| -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 { |