diff options
author | Risan <risan@google.com> | 2018-11-13 11:57:12 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-11-13 11:57:12 -0800 |
commit | ee32e0d473a28437d214a577bcf2199059b9d98d (patch) | |
tree | ea30fa0d17ade7fd2affd7f159313936f4cf8939 /packages/ExternalStorageProvider | |
parent | 3c68dcdc0e049006b56d3e274510db8c7fef9bb4 (diff) | |
parent | eb871cc91627dcc9f21e1cdd047a469fabd3c616 (diff) |
Merge "Introducing StubVolume in StorageManager" am: b499af866c
am: eb871cc916
Change-Id: I69240d32659b511aec0e1e029fb6c6f1ab455c9c
Diffstat (limited to 'packages/ExternalStorageProvider')
-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 0a720a5b234e..4a9c35615131 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -184,7 +184,8 @@ public class ExternalStorageProvider extends FileSystemProvider { title = mStorageManager.getBestVolumeDescription(privateVol); storageUuid = StorageManager.convert(privateVol.fsUuid); } - } else if (volume.getType() == VolumeInfo.TYPE_PUBLIC + } else if ((volume.getType() == VolumeInfo.TYPE_PUBLIC + || volume.getType() == VolumeInfo.TYPE_STUB) && volume.getMountUserId() == userId) { rootId = volume.getFsUuid(); title = mStorageManager.getBestVolumeDescription(volume); |