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

Merge "Support getStorageVolume() for synthetic volumes." into rvc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2020-06-01 14:18:32 +00:00
committed by Android (Google) Code Review
parent 4d96602de0 88818fe7b2
commit fd71805e1c
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/os/storage/StorageManager.java
View File

@@ -56,6 +56,7 @@ import android.content.pm.IPackageMoveObserver;
import android.content.pm.PackageManager;
import android.content.res.ObbInfo;
import android.content.res.ObbScanner;
import android.database.Cursor;
import android.net.Uri;
import android.os.Binder;
import android.os.Environment;
@@ -1201,7 +1202,19 @@ public class StorageManager {
* {@link MediaStore} item.
*/
public @NonNull StorageVolume getStorageVolume(@NonNull Uri uri) {
final String volumeName = MediaStore.getVolumeName(uri);
String volumeName = MediaStore.getVolumeName(uri);
// When Uri is pointing at a synthetic volume, we're willing to query to
// resolve the actual volume name
if (Objects.equals(volumeName, MediaStore.VOLUME_EXTERNAL)) {
try (Cursor c = mContext.getContentResolver().query(uri,
new String[] { MediaStore.MediaColumns.VOLUME_NAME }, null, null)) {
if (c.moveToFirst()) {
volumeName = c.getString(0);
}
}
}
switch (volumeName) {
case MediaStore.VOLUME_EXTERNAL_PRIMARY:
return getPrimaryStorageVolume();