diff options
| author | Felipe Leme <felipeal@google.com> | 2016-06-10 21:54:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-10 21:54:31 +0000 |
| commit | 2ee81a32114ac605168a709ee9a8ccbc8fe6d34a (patch) | |
| tree | a119d68775d345e716b614288803f0c8e61ffb55 /packages/DocumentsUI | |
| parent | 0979d718c57de61d2f644f15eef575fbe7d0a435 (diff) | |
| parent | be0bacda9b07c987b336f4314e73b10b7e4b24c4 (diff) | |
Merge \"Fixed check for visible volume.\" into nyc-dev
am: be0bacda9b
Change-Id: I3802f5025e83826f47d674f6d03e78737d8fe8b3
Diffstat (limited to 'packages/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java index ddf87bbe6333..6588ee1c91c6 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java @@ -287,15 +287,16 @@ public class OpenExternalDirectoryActivity extends Activity { 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); - - return isVisible && root.equals(path); + Log.d(TAG, "Volume: " + volume + + "\n\tuserId: " + userId + + "\n\tuserPath: " + userPath + + "\n\troot: " + root + + "\n\tpath: " + path + + "\n\tisMounted: " + isMounted); + + return isMounted && root.equals(path); } private static Uri getGrantedUriPermission(Context context, ContentProviderClient provider, |