Merge "Fix "division by zero" crash after USB mass storage disconnects"

2016-01-05 00:26:43 +00:00
parent d298d474e6 b997bd989e
commit a44b4feed4
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -74,7 +74,9 @@ public class StorageVolumePreference extends Preference {
            final String used = Formatter.formatFileSize(context, usedBytes);
            final String total = Formatter.formatFileSize(context, totalBytes);
            setSummary(context.getString(R.string.storage_volume_summary, used, total));
+            if (totalBytes > 0) {
                mUsedPercent = (int) ((usedBytes * 100) / totalBytes);
+            }

            if (freeBytes < mStorageManager.getStorageLowBytes(path)) {
                mColor = StorageSettings.COLOR_WARNING;