Merge "Fix crash when measuring storage." into oc-dev am: a6bd937c93 (dcc92a8a) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageMeasurement.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -151,8 +151,15 @@ public class StorageMeasurement {
		final MeasurementDetails details = new MeasurementDetails();
		if (mVolume == null) return details;

		try {
		details.totalSize = mStats.getTotalBytes(mVolume.fsUuid);
		details.availSize = mStats.getFreeBytes(mVolume.fsUuid);
		} catch (IllegalStateException e) {
		// The storage volume became null while we were measuring it.
		Log.w(TAG, e);
		return details;
		}


		final long finishTotal = SystemClock.elapsedRealtime();
		Log.d(TAG, "Measured total storage in " + (finishTotal - start) + "ms");

+6 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,9 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
		return FileUtils.roundStorageSize(mStorage.getPrimaryStorageSize());
		} else {
		final VolumeInfo vol = mStorage.findVolumeByUuid(volumeUuid);
		if (vol == null) {
		throw new IllegalStateException("Volume was unexpected null");
		}
		return FileUtils.roundStorageSize(vol.disk.size);
		}
		}
		@@ -185,6 +188,9 @@ public class StorageStatsService extends IStorageStatsManager.Stub {
		return Environment.getDataDirectory().getUsableSpace() + cacheBytes;
		} else {
		final VolumeInfo vol = mStorage.findVolumeByUuid(volumeUuid);
		if (vol == null) {
		throw new IllegalStateException("Volume was unexpected null");
		}
		return vol.getPath().getUsableSpace() + cacheBytes;
		}
		}