commit 61d1838ae2bea3fce4c1aa81328986d07f784dcf
author Amith Yamasani <yamasani@google.com> Tue Jan 05 00:33:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 05 00:33:03 2016 +0000
tree 77dae8cfc880e06da2a6353d1579c3a4571ed102
parent d8cf66ef73a5f62681fcc51f514616f97d95588f
parent 4ed2bb1ba93d8b5fe101c660d24898bf3ed44592

Merge "Fix "division by zero" crash after USB mass storage disconnects" am: a44b4feed4
am: 4ed2bb1ba9

* commit '4ed2bb1ba93d8b5fe101c660d24898bf3ed44592':
  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 657ade5..dba636c 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -75,7 +75,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;