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

Merge "Fix getStorageVolumes to return public volumes visible to userIdSharingMedia with."

Browse Source
This commit is contained in:
Himanshu Gupta
2023-02-08 10:29:33 +00:00
committed by Gerrit Code Review
parent 52cdf7372d b887d19038
commit e6454053ce
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -3851,8 +3851,12 @@ class StorageManagerService extends IStorageManager.Stub
// Return both read only and write only volumes. When includeSharedProfile is // Return both read only and write only volumes. When includeSharedProfile is
// true, all the volumes of userIdSharingMedia should be returned when queried // true, all the volumes of userIdSharingMedia should be returned when queried
// from the user it shares media with // from the user it shares media with
// Public Volumes will be also be returned if visible to the
// userIdSharingMedia with.
match = vol.isVisibleForUser(userId) match = vol.isVisibleForUser(userId)
|| (!vol.isVisible() && includeInvisible && vol.getPath() != null) || (!vol.isVisible() && includeInvisible && vol.getPath() != null)
|| (vol.getType() == VolumeInfo.TYPE_PUBLIC
&& vol.isVisibleForUser(userIdSharingMedia))
|| (includeSharedProfile && vol.isVisibleForUser(userIdSharingMedia)); || (includeSharedProfile && vol.isVisibleForUser(userIdSharingMedia));
} }
if (!match) continue; if (!match) continue;