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

2016-06-10 19:38:49 +00:00
parent e4b1fb94e3 123a0e712e
commit 6da2fb61ce
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -3031,7 +3031,8 @@ class MountService extends IMountService.Stub
                if (forWrite) {
                    match = vol.isVisibleForWrite(userId);
                } else {
-                    match = vol.isVisibleForRead(userId) || includeInvisible;
+                    match = vol.isVisibleForRead(userId)
+                            || (includeInvisible && vol.getPath() != null);
                }
                if (!match) continue;