summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-01-28 10:31:01 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-28 10:31:01 -0800
commitc28fde57f0c7762913615b16d651d4e7991d6175 (patch)
tree6838da850e2953b298d71c54d098c9a0654b6aa9 /media
parentbe3d6457984cbb3c39ab0741fe8cb721a98139c3 (diff)
parent0b515aece642283a25c6a4416f0aecdaf17bdb58 (diff)
downloadframeworks_base-c28fde57f0c7762913615b16d651d4e7991d6175.zip
frameworks_base-c28fde57f0c7762913615b16d651d4e7991d6175.tar.gz
frameworks_base-c28fde57f0c7762913615b16d651d4e7991d6175.tar.bz2
am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström # Via Android Git Automerger (1) and others * commit '0b515aece642283a25c6a4416f0aecdaf17bdb58': Fix possible integer overflow in MtpStorage
Diffstat (limited to 'media')
-rw-r--r--media/java/android/mtp/MtpStorage.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class MtpStorage {
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();
}