Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 829992b6 authored by Saumya Pathak's avatar Saumya Pathak Committed by Automerger Merge Worker
Browse files

Merge "Fix bug in getStorageVolumesIncludingSharedProfiles" into tm-dev am: 7f24e585 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164345



Change-Id: I2a6509e4e2915530c01d104dde40fe6e4d400df2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 71931a53 7f24e585

services/core/java/com/android/server/StorageManagerService.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -3880,9 +3880,12 @@ class StorageManagerService extends IStorageManager.Stub 
                    match = vol.isVisibleForWrite(userId)

                    match = vol.isVisibleForWrite(userId)

                            || (includeSharedProfile && vol.isVisibleForWrite(userIdSharingMedia));

                            || (includeSharedProfile && vol.isVisibleForWrite(userIdSharingMedia));

                } else {

                } else {

                    // Return both read only and write only volumes. When includeSharedProfile is

                    // true, all the volumes of userIdSharingMedia should be returned when queried

                    // from the user it shares media with

                    match = vol.isVisibleForUser(userId)

                    match = vol.isVisibleForUser(userId)

                            || (!vol.isVisible() && includeInvisible && vol.getPath() != null)

                            || (!vol.isVisible() && includeInvisible && vol.getPath() != null)

                            || (includeSharedProfile && vol.isVisibleForRead(userIdSharingMedia));

                            || (includeSharedProfile && vol.isVisibleForUser(userIdSharingMedia));

                }

                }

                if (!match) continue;

                if (!match) continue;