commit 4260098e02c8ea329fc949c1b74c6c974fec8770
author Jeff Sharkey <jsharkey@google.com> Mon Jan 21 00:54:31 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 21 00:54:31 2019 +0000
tree 4b4ffd44400d54cf96ff4516a9002a060e148fbf
parent ef033dada9fea6658749364ec3ae4346cfac00b7
parent 3036089cfac1cc563538aa058dcac4344c9dff7e

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

core/java/android/provider/MediaStore.java

diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index e36a1c2..3a49986 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -2915,7 +2915,7 @@
         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 {