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

Commit 1f160df1 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge \"Check for valid paths when getVolumeList() returns invisible volumes.\" into nyc-dev 

am: 6da2fb61

Change-Id: I57e257307eb854d04f298eeefc8a55b55ee6ea78
parents 93ff5124 6da2fb61

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -3031,7 +3031,8 @@ class MountService extends IMountService.Stub 
                if (forWrite) {

                if (forWrite) {

                    match = vol.isVisibleForWrite(userId);

                    match = vol.isVisibleForWrite(userId);

                } else {

                } else {

                    match = vol.isVisibleForRead(userId) || includeInvisible;

                    match = vol.isVisibleForRead(userId)

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

                }

                }

                if (!match) continue;

                if (!match) continue;