summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2014-09-07 12:04:23 +0000
committerGerrit Code Review <gerrit@cyanogenmod.org>2014-09-07 12:04:23 +0000
commit2dda3603137a56b07ec48741dbeb5f3d97ba71c1 (patch)
tree82dbe9efbfad4c5e5ed5ffbc7a6d5c4538e79d54
parent04edcb81f955f452c0be17000f967b4f2a262060 (diff)
parente71cb11ce438bea57979fec4e5d6eb5fb622284e (diff)
downloadpackages_apps_ContactsCommon-2dda3603137a56b07ec48741dbeb5f3d97ba71c1.tar.gz
packages_apps_ContactsCommon-2dda3603137a56b07ec48741dbeb5f3d97ba71c1.tar.bz2
packages_apps_ContactsCommon-2dda3603137a56b07ec48741dbeb5f3d97ba71c1.zip
Merge "contacts: return the first sdcard entry found" into cm-11.0
-rw-r--r--src/com/android/contacts/common/MoreContactUtils.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/contacts/common/MoreContactUtils.java b/src/com/android/contacts/common/MoreContactUtils.java
index c4989bf9..b31eb9aa 100644
--- a/src/com/android/contacts/common/MoreContactUtils.java
+++ b/src/com/android/contacts/common/MoreContactUtils.java
@@ -832,17 +832,16 @@ public class MoreContactUtils {
}
public static String getSDPath(Context context) {
- String sd = null;
StorageManager mStorageManager = (StorageManager) context
.getSystemService(Context.STORAGE_SERVICE);
StorageVolume[] volumes = mStorageManager.getVolumeList();
for (int i = 0; i < volumes.length; i++) {
if (volumes[i].isRemovable() && volumes[i].allowMassStorage()
&& volumes[i].getDescription(context).contains("SD")) {
- sd = volumes[i].getPath();
+ return volumes[i].getPath();
}
}
- return sd;
+ return null;
}
/**