Merge "Filter volumes to only those the caller can see."

2019-01-21 00:54:31 +00:00
parent ef033dada9 3036089cfa
commit 4260098e02
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -2915,7 +2915,7 @@ public final class MediaStore {
        final Set<String> volumeNames = new ArraySet<>();
        volumeNames.add(VOLUME_INTERNAL);
        for (VolumeInfo vi : sm.getVolumes()) {
-            if (vi.isMountedReadable()) {
+            if (vi.isVisibleForUser(UserHandle.myUserId()) && vi.isMountedReadable()) {
                if (vi.isPrimary()) {
                    volumeNames.add(VOLUME_EXTERNAL);
                } else {