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

Merge "No quota-level details for public volumes." into oc-dev

Browse Source 
am: 4566cb5756

Change-Id: Ib778a428d4f43b976b13ab21aee021bb9beb7d79
This commit is contained in:
Jeff Sharkey
2017-05-07 17:45:36 +00:00
committed by android-build-merger
parent eebdc4eb66 4566cb5756
commit da61aba219
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java
View File

@@ -152,6 +152,12 @@ public class StorageMeasurement {
final MeasurementDetails details = new MeasurementDetails(); final MeasurementDetails details = new MeasurementDetails();
if (mVolume == null) return details; if (mVolume == null) return details;
if (mVolume.getType() == VolumeInfo.TYPE_PUBLIC) {
details.totalSize = mVolume.getPath().getTotalSpace();
details.availSize = mVolume.getPath().getUsableSpace();
return details;
}
try { try {
details.totalSize = mStats.getTotalBytes(mVolume.fsUuid); details.totalSize = mStats.getTotalBytes(mVolume.fsUuid);
details.availSize = mStats.getFreeBytes(mVolume.fsUuid); details.availSize = mStats.getFreeBytes(mVolume.fsUuid);
@@ -161,7 +167,6 @@ public class StorageMeasurement {
return details; return details;
} }
final long finishTotal = SystemClock.elapsedRealtime(); final long finishTotal = SystemClock.elapsedRealtime();
Log.d(TAG, "Measured total storage in " + (finishTotal - start) + "ms"); Log.d(TAG, "Measured total storage in " + (finishTotal - start) + "ms");