commit 0b515aece642283a25c6a4416f0aecdaf17bdb58
author Amith Yamasani <yamasani@google.com> Mon Jan 28 10:28:38 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 28 10:28:38 2013 -0800
tree 45712d1c04113dcb44d0eb91480bbc4e8b036006
parent a56711a04618bbdcdaecf15e1815a5618e6b4737
parent 3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38

am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"

# By Henrik Engström
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38':
  Fix possible integer overflow in MtpStorage

media/java/android/mtp/MtpStorage.java

diff --git a/media/java/android/mtp/MtpStorage.java b/media/java/android/mtp/MtpStorage.java
index 9cf65a3..e20eabc 100644
--- a/media/java/android/mtp/MtpStorage.java
+++ b/media/java/android/mtp/MtpStorage.java
@@ -39,7 +39,7 @@
         mStorageId = volume.getStorageId();
         mPath = volume.getPath();
         mDescription = context.getResources().getString(volume.getDescriptionId());
-        mReserveSpace = volume.getMtpReserveSpace() * 1024 * 1024;
+        mReserveSpace = volume.getMtpReserveSpace() * 1024L * 1024L;
         mRemovable = volume.isRemovable();
         mMaxFileSize = volume.getMaxFileSize();
     }