Merge "Fix getStorageVolumes to return only storage volumes available to the calling user"

2022-02-09 12:15:31 +00:00
parent 5075e557fd 7f24335493
commit 0d5f2aedf3
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/StorageManagerService.java
+++ b/services/core/java/com/android/server/StorageManagerService.java
@@ -4071,7 +4071,7 @@ class StorageManagerService extends IStorageManager.Stub
                            || (includeSharedProfile && vol.isVisibleForWrite(userIdSharingMedia));
                } else {
                    match = vol.isVisibleForUser(userId)
-                            || (includeInvisible && vol.getPath() != null)
+                            || (!vol.isVisible() && includeInvisible && vol.getPath() != null)
                            || (includeSharedProfile && vol.isVisibleForRead(userIdSharingMedia));
                }
                if (!match) continue;