commit a44b4feed42d597224f9221396ef3ca1964ecc4b
author Amith Yamasani <yamasani@google.com> Tue Jan 05 00:26:43 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 05 00:26:43 2016 +0000
tree 1e2e3f2f61d3c0c4bb5a68511bce8ad020e71255
parent d298d474e620766b4308376525ef6a2730bbb299
parent b997bd989ec68c657a0263f459545dbea50d6de3

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

src/com/android/settings/deviceinfo/StorageVolumePreference.java

diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index 3511b91..04e0ffc 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -74,7 +74,9 @@
             final String used = Formatter.formatFileSize(context, usedBytes);
             final String total = Formatter.formatFileSize(context, totalBytes);
             setSummary(context.getString(R.string.storage_volume_summary, used, total));
-            mUsedPercent = (int) ((usedBytes * 100) / totalBytes);
+            if (totalBytes > 0) {
+                mUsedPercent = (int) ((usedBytes * 100) / totalBytes);
+            }
 
             if (freeBytes < mStorageManager.getStorageLowBytes(path)) {
                 mColor = StorageSettings.COLOR_WARNING;