Merge "contacts: don't assume the device has an sdcard" into cm-11.0

3 files changed, 22 insertions, 12 deletions

diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index 4a4a053e..c4989bf9 100644
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -821,14 +821,14 @@ public class MoreContactUtils {
     }
 
     public static boolean sdCardExist(Context context) {
-        boolean ret = false;
+        String sdcardPath = getSDPath(context);
+        if (sdcardPath == null) {
+            return false;
+        }
         StorageManager mStorageManager = (StorageManager) context
                 .getSystemService(Context.STORAGE_SERVICE);
-        if (mStorageManager.getVolumeState(getSDPath(context)).equals(
-                android.os.Environment.MEDIA_MOUNTED)) {
-            ret = true;
-        }
-        return ret;
+        return mStorageManager.getVolumeState(sdcardPath).equals(
+                android.os.Environment.MEDIA_MOUNTED);
     }
 
     public static String getSDPath(Context context) {
diff --git a/src/com/android/contacts/common/vcard/ImportVCardActivity.java b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
index c9da6135..8e444ad7 100644
--- a/src/com/android/contacts/common/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/common/vcard/ImportVCardActivity.java
@@ -1101,13 +1101,18 @@ public class ImportVCardActivity extends Activity {
         File file;
         switch(mSelectedStorage) {
             case VCardService.INTERNAL_PATH:
-               file = Environment.getExternalStorageDirectory();
-               break;
+                file = Environment.getExternalStorageDirectory();
+                break;
             case VCardService.EXTERNAL_PATH:
-               file = new File(MoreContactUtils.getSDPath(this));
-               break;
+                final String sdcardPath = MoreContactUtils.getSDPath(this);
+                if (sdcardPath != null) {
+                    file = new File(sdcardPath);
+                } else {
+                    file = Environment.getExternalStorageDirectory();
+                }
+                break;
             default:
-               file = Environment.getExternalStorageDirectory();
+                file = Environment.getExternalStorageDirectory();
                 break;
             }
         if (!file.exists() || !file.isDirectory() || !file.canRead()) {
diff --git a/src/com/android/contacts/common/vcard/VCardService.java b/src/com/android/contacts/common/vcard/VCardService.java
index 53c5986c..fe1502ea 100644
--- a/src/com/android/contacts/common/vcard/VCardService.java
+++ b/src/com/android/contacts/common/vcard/VCardService.java
@@ -155,7 +155,12 @@ public class VCardService extends Service {
 
     private void initExporterParams() {
         if (mStorage == EXTERNAL_PATH) {
-            mTargetDirectory = new File(MoreContactUtils.getSDPath(this));
+            String targetDirectory = MoreContactUtils.getSDPath(this);
+            if (targetDirectory != null) {
+                mTargetDirectory = new File(targetDirectory);
+            } else {
+                mTargetDirectory = Environment.getExternalStorageDirectory();
+            }
         } else {
             mTargetDirectory = Environment.getExternalStorageDirectory();
         }