diff options
| author | Risan <risan@google.com> | 2018-11-13 12:12:23 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-13 12:12:23 -0800 |
| commit | f8771d362c0058d90f6c32a35cb15aa0b86f11f4 (patch) | |
| tree | eb7541dfb7f5e0f7c8e9880a0209ac762c879dce /packages | |
| parent | f84f1fd2d9bcb7af7b777d237cf36e9185499e83 (diff) | |
| parent | ee32e0d473a28437d214a577bcf2199059b9d98d (diff) | |
Merge "Introducing StubVolume in StorageManager" am: b499af866c am: eb871cc916
am: ee32e0d473
Change-Id: I4098132df9833b7cbac0db9bdadac297d324a822
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java | 3 | ||||
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 4e52ff6d016c..4abcf73af109 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -186,7 +186,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); diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java index 5a57e69ae131..8f9394fd3c5a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java +++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java @@ -152,7 +152,8 @@ public class StorageMeasurement { final MeasurementDetails details = new MeasurementDetails(); if (mVolume == null) return details; - if (mVolume.getType() == VolumeInfo.TYPE_PUBLIC) { + if (mVolume.getType() == VolumeInfo.TYPE_PUBLIC + || mVolume.getType() == VolumeInfo.TYPE_STUB) { details.totalSize = mVolume.getPath().getTotalSpace(); details.availSize = mVolume.getPath().getUsableSpace(); return details; |