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

Merge "Public volumes belong to a single user." into nyc-mr1-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2016-11-07 23:43:43 +00:00
committed by Android (Google) Code Review
parent 25cba2de54 8b38d083c4
commit 0f35d29a7e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
View File

@@ -161,7 +161,8 @@ public class ExternalStorageProvider extends DocumentsProvider {
final VolumeInfo privateVol = mStorageManager.findPrivateForEmulated(volume); final VolumeInfo privateVol = mStorageManager.findPrivateForEmulated(volume);
title = mStorageManager.getBestVolumeDescription(privateVol); title = mStorageManager.getBestVolumeDescription(privateVol);
} }
} else if (volume.getType() == VolumeInfo.TYPE_PUBLIC) { } else if (volume.getType() == VolumeInfo.TYPE_PUBLIC
&& volume.getMountUserId() == userId) {
rootId = volume.getFsUuid(); rootId = volume.getFsUuid();
title = mStorageManager.getBestVolumeDescription(volume); title = mStorageManager.getBestVolumeDescription(volume);
} else { } else {