diff options
| author | 2016-11-07 23:43:43 +0000 | |
|---|---|---|
| committer | 2016-11-07 23:43:46 +0000 | |
| commit | 0f35d29a7e596b3984f0f2812b6c584b1fd3e168 (patch) | |
| tree | fdda4308dc38cee81a60d3f614e78e11c75202d8 | |
| parent | 25cba2de54e792ea1259deebee6d59233b394430 (diff) | |
| parent | 8b38d083c42e2706e1ff5a1410fa61d1f5dea3f5 (diff) | |
Merge "Public volumes belong to a single user." into nyc-mr1-dev
| -rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 3ef9b8e1b8c4..10e5dcc91678 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -161,7 +161,8 @@ public class ExternalStorageProvider extends DocumentsProvider { final VolumeInfo privateVol = mStorageManager.findPrivateForEmulated(volume); title = mStorageManager.getBestVolumeDescription(privateVol); } - } else if (volume.getType() == VolumeInfo.TYPE_PUBLIC) { + } else if (volume.getType() == VolumeInfo.TYPE_PUBLIC + && volume.getMountUserId() == userId) { rootId = volume.getFsUuid(); title = mStorageManager.getBestVolumeDescription(volume); } else { |