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

am: 6da2fb61ce Change-Id: I57e257307eb854d04f298eeefc8a55b55ee6ea78
2016-06-10 19:58:44 +00:00
parent 93ff5124c6 6da2fb61ce
commit 1f160df10d
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;