commit 6d2def71e0a7f6ed81b96444fb1cce7177251b36
author Amith Yamasani <yamasani@google.com> Mon Jan 28 10:33:55 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 28 10:33:55 2013 -0800
tree 8705c4ccf2b4b93a1a3ded1c38c6c09a540540f8
parent a6a5c8f6b66c0750a28d2ad9cba18d0c730c4393
parent c28fde57f0c7762913615b16d651d4e7991d6175

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

# By Henrik Engström
# Via Android Git Automerger (2) and others
* commit 'c28fde57f0c7762913615b16d651d4e7991d6175':
  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();
     }