summaryrefslogtreecommitdiffstats
path: root/media/mtp/MtpServer.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-12-12 12:17:43 -0800
committerMike Lockwood <lockwood@android.com>2010-12-12 12:17:43 -0800
commit20c3be0e0394e1340c036685eb1edb8f6ef5a2ac (patch)
tree8f3ae6045924fe4692042cb0cd61feb195a8ddb3 /media/mtp/MtpServer.cpp
parent8d45a37ff076814db39471f15d309567605b3416 (diff)
downloadframeworks_av-20c3be0e0394e1340c036685eb1edb8f6ef5a2ac.zip
frameworks_av-20c3be0e0394e1340c036685eb1edb8f6ef5a2ac.tar.gz
frameworks_av-20c3be0e0394e1340c036685eb1edb8f6ef5a2ac.tar.bz2
MTP: Add support for reserve storage setting to avoid low storage situations.
Set resource config_mtpReserveSpaceMegabytes to number of megabytes to reserve. If MTP has dedicated storage this value should be zero, but if MTP is sharing storage with the rest of the system, set this to a positive value to ensure that MTP activity does not result in the storage being too close to full. BUG: 3250924 Change-Id: I881c87240da268bad1ea1b99ad03673ab85ffdbf Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpServer.cpp')
-rw-r--r--media/mtp/MtpServer.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index d65845d..b371e41 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -104,10 +104,10 @@ MtpServer::MtpServer(int fd, MtpDatabase* database,
MtpServer::~MtpServer() {
}
-void MtpServer::addStorage(const char* filePath) {
+void MtpServer::addStorage(const char* filePath, uint64_t reserveSpace) {
int index = mStorages.size() + 1;
index |= index << 16; // set high and low part to our index
- MtpStorage* storage = new MtpStorage(index, filePath, mDatabase);
+ MtpStorage* storage = new MtpStorage(index, filePath, reserveSpace);
addStorage(storage);
}
@@ -687,6 +687,10 @@ MtpResponseCode MtpServer::doSendObjectInfo() {
if (access(path, R_OK) == 0)
return MTP_RESPONSE_GENERAL_ERROR;
+ // check space first
+ if (mSendObjectFileSize > storage->getFreeSpace())
+ return MTP_RESPONSE_STORAGE_FULL;
+
MtpObjectHandle handle = mDatabase->beginSendObject((const char*)path,
format, parent, storageID, mSendObjectFileSize, modifiedTime);
if (handle == kInvalidObjectHandle) {