Merge \"Fixed check for visible volume.\" into nyc-dev
am: be0bacda9b
Change-Id: I3802f5025e83826f47d674f6d03e78737d8fe8b3
diff --git a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
index ddf87bb..6588ee1 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
@@ -287,15 +287,16 @@
private static boolean isRightVolume(VolumeInfo volume, String root, int userId) {
final File userPath = volume.getPathForUser(userId);
final String path = userPath == null ? null : volume.getPathForUser(userId).getPath();
- final boolean isVisible = volume.isVisibleForWrite(userId);
+ final boolean isMounted = volume.isMountedReadable();
if (DEBUG)
- Log.d(TAG, "Volume: " + volume + " userId: " + userId + " root: " + root
- + " volumePath: " + volume.getPath()
- + " pathForUser: " + path
- + " internalPathForUser: " + volume.getInternalPath()
- + " isVisible: " + isVisible);
+ Log.d(TAG, "Volume: " + volume
+ + "\n\tuserId: " + userId
+ + "\n\tuserPath: " + userPath
+ + "\n\troot: " + root
+ + "\n\tpath: " + path
+ + "\n\tisMounted: " + isMounted);
- return isVisible && root.equals(path);
+ return isMounted && root.equals(path);
}
private static Uri getGrantedUriPermission(Context context, ContentProviderClient provider,