Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \\"Fixed check for visible volume.\\" into nyc-dev am: be0bacda9b

Browse Source 
am: 2ee81a3211

Change-Id: I6c568b5934268eb8d7d44bd65a59adba4dabd7a7
This commit is contained in:
Felipe Leme
2016-06-10 21:58:51 +00:00
committed by android-build-merger
parent ead9f32ed2 2ee81a3211
commit 18ee3e53c8
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java
View File

@@ -287,15 +287,16 @@ public class OpenExternalDirectoryActivity extends Activity {
private static boolean isRightVolume(VolumeInfo volume, String root, int userId) { private static boolean isRightVolume(VolumeInfo volume, String root, int userId) {
final File userPath = volume.getPathForUser(userId); final File userPath = volume.getPathForUser(userId);
final String path = userPath == null ? null : volume.getPathForUser(userId).getPath(); final String path = userPath == null ? null : volume.getPathForUser(userId).getPath();
final boolean isVisible = volume.isVisibleForWrite(userId); final boolean isMounted = volume.isMountedReadable();
if (DEBUG) if (DEBUG)
Log.d(TAG, "Volume: " + volume + " userId: " + userId + " root: " + root Log.d(TAG, "Volume: " + volume
+ " volumePath: " + volume.getPath() + "\n\tuserId: " + userId
+ " pathForUser: " + path + "\n\tuserPath: " + userPath
+ " internalPathForUser: " + volume.getInternalPath() + "\n\troot: " + root
+ " isVisible: " + isVisible); + "\n\tpath: " + path
+ "\n\tisMounted: " + isMounted);
return isVisible && root.equals(path); return isMounted && root.equals(path);
} }
private static Uri getGrantedUriPermission(Context context, ContentProviderClient provider, private static Uri getGrantedUriPermission(Context context, ContentProviderClient provider,