am 53ad027c: Merge "MtpStorage: correct the size of reserve space for MTP"

* commit '53ad027c46bf578e26e5db70319b17a671ce8a36':
  MtpStorage: correct the size of reserve space for MTP
This commit is contained in:
Jean-Baptiste Queru
2012-08-10 09:26:47 -07:00
committed by Android Git Automerger

View File

@@ -39,7 +39,7 @@ public class MtpStorage {
mStorageId = volume.getStorageId(); mStorageId = volume.getStorageId();
mPath = volume.getPath(); mPath = volume.getPath();
mDescription = context.getResources().getString(volume.getDescriptionId()); mDescription = context.getResources().getString(volume.getDescriptionId());
mReserveSpace = volume.getMtpReserveSpace(); mReserveSpace = volume.getMtpReserveSpace() * 1024 * 1024;
mRemovable = volume.isRemovable(); mRemovable = volume.isRemovable();
mMaxFileSize = volume.getMaxFileSize(); mMaxFileSize = volume.getMaxFileSize();
} }
@@ -87,7 +87,7 @@ public class MtpStorage {
* Returns the amount of space to reserve on the storage file system. * 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. * 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() { public final long getReserveSpace() {
return mReserveSpace; return mReserveSpace;