Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"

Browse Source 
# By Jan Bjernler
# Via Gerrit Code Review
* commit '69abccc3cdacee354dec8867865a0577a4e14e63':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content
This commit is contained in:
Marco Nelissen
2013-02-08 08:41:20 -08:00
committed by Android Git Automerger
parent c2edfa2b96 69abccc3cd
commit b683f3542a
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/provider/MediaStore.java
View File

@@ -1324,6 +1324,18 @@ public final class MediaStore {
} }
public static final class Media implements AudioColumns { public static final class Media implements AudioColumns {
private static final String[] EXTERNAL_PATHS;
static {
String secondary_storage = System.getenv("SECONDARY_STORAGE");
if (secondary_storage != null) {
EXTERNAL_PATHS = secondary_storage.split(":");
} else {
EXTERNAL_PATHS = new String[0];
}
}
/** /**
* Get the content:// style URI for the audio media table on the * Get the content:// style URI for the audio media table on the
* given volume. * given volume.
@@ -1337,6 +1349,12 @@ public final class MediaStore {
} }
public static Uri getContentUriForPath(String path) { public static Uri getContentUriForPath(String path) {
for (String ep : EXTERNAL_PATHS) {
if (path.startsWith(ep)) {
return EXTERNAL_CONTENT_URI;
}
}
return (path.startsWith(Environment.getExternalStorageDirectory().getPath()) ? return (path.startsWith(Environment.getExternalStorageDirectory().getPath()) ?
EXTERNAL_CONTENT_URI : INTERNAL_CONTENT_URI); EXTERNAL_CONTENT_URI : INTERNAL_CONTENT_URI);
} }