commit 5db4cc8fee8b919b5f62f222af92a4e995ca6a70
author Jeff Sharkey <jsharkey@google.com> Fri Jul 31 01:46:45 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 31 01:46:45 2015 +0000
tree 1477f433e7cf0ebe348dc4c3a164d9daaa2078e5
parent e3b0119f79d11744a7f590510b184feef0f45894
parent 865ea7c800883176e5bd9924f27abb3cbacd5178

Merge "Handle volumes without visible paths." into mnc-dev

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 4f0c6a41..393771a 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -162,7 +162,11 @@
                 if (volume.getType() == VolumeInfo.TYPE_PUBLIC) {
                     root.flags |= Root.FLAG_HAS_SETTINGS;
                 }
-                root.visiblePath = volume.getPathForUser(userId);
+                if (volume.isVisibleForRead(userId)) {
+                    root.visiblePath = volume.getPathForUser(userId);
+                } else {
+                    root.visiblePath = null;
+                }
                 root.path = volume.getInternalPathForUser(userId);
                 root.docId = getDocIdForFile(root.path);