summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-10 09:26:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-10 09:26:47 -0700
commitd2388b50a5c16b920bdd656448107a21e49d753b (patch)
tree3125b509d45fcc6258958ed7f4e29a0b19af36ae /media/java
parent3401c2e9e1343c964eb9495cbf8568172c14ac82 (diff)
parent53ad027c46bf578e26e5db70319b17a671ce8a36 (diff)
downloadframeworks_base-d2388b50a5c16b920bdd656448107a21e49d753b.zip
frameworks_base-d2388b50a5c16b920bdd656448107a21e49d753b.tar.gz
frameworks_base-d2388b50a5c16b920bdd656448107a21e49d753b.tar.bz2
am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"
* commit '53ad027c46bf578e26e5db70319b17a671ce8a36': MtpStorage: correct the size of reserve space for MTP
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/mtp/MtpStorage.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/mtp/MtpStorage.java b/media/java/android/mtp/MtpStorage.java
index 2f47aad..9cf65a3 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();
+ mReserveSpace = volume.getMtpReserveSpace() * 1024 * 1024;
mRemovable = volume.isRemovable();
mMaxFileSize = volume.getMaxFileSize();
}
@@ -87,7 +87,7 @@ public class MtpStorage {
* Returns the amount of space to reserve on the storage file system.
* This can be set to a non-zero value to prevent MTP from filling up the entire storage.
*
- * @return the storage unit description
+ * @return reserved space in bytes.
*/
public final long getReserveSpace() {
return mReserveSpace;