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

Merge "Better scanning of secondary storage volumes."

Browse Source
This commit is contained in:
Jeff Sharkey
2019-01-20 17:55:05 +00:00
committed by Android (Google) Code Review
parent 7276946b92 1eda2caa98
commit f4246a1c17
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1027,7 +1027,7 @@ public final class MediaStore {
/** @hide */
public static final Uri getContentUriForPath(String path) {
return getContentUri(getVolumeNameForPath(path));
return getContentUri(getVolumeName(new File(path)));
}
/**
@@ -1197,7 +1197,7 @@ public final class MediaStore {
/** @hide */
public static Uri getContentUriForPath(@NonNull String path) {
return getContentUri(getVolumeNameForPath(path));
return getContentUri(getVolumeName(new File(path)));
}
/** @hide */
@@ -1211,10 +1211,11 @@ public final class MediaStore {
}
}
private static String getVolumeNameForPath(@NonNull String path) {
/** {@hide} */
public static @NonNull String getVolumeName(@NonNull File path) {
final StorageManager sm = AppGlobals.getInitialApplication()
.getSystemService(StorageManager.class);
final StorageVolume sv = sm.getStorageVolume(new File(path));
final StorageVolume sv = sm.getStorageVolume(path);
if (sv != null) {
if (sv.isPrimary()) {
return VOLUME_EXTERNAL;
@@ -1991,7 +1992,7 @@ public final class MediaStore {
* access this path.
*/
public static @Nullable Uri getContentUriForPath(@NonNull String path) {
return getContentUri(getVolumeNameForPath(path));
return getContentUri(getVolumeName(new File(path)));
}
/**