Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MTP: check for replacing existing files via the database instead of the file system"

Browse Source
This commit is contained in:
Mike Lockwood
2010-12-13 22:03:14 -08:00
committed by Android (Google) Code Review
parent dbb4ecffe3 bafca214ea
commit b7b7cdf46a
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
media/java/android/media/MtpDatabase.java
View File

@@ -91,6 +91,7 @@ public class MtpDatabase {
Files.FileColumns.DATE_MODIFIED, // 5
};
private static final String ID_WHERE = Files.FileColumns._ID + "=?";
private static final String PATH_WHERE = Files.FileColumns.DATA + "=?";
private static final String PARENT_WHERE = Files.FileColumns.PARENT + "=?";
private static final String PARENT_FORMAT_WHERE = PARENT_WHERE + " AND "
+ Files.FileColumns.FORMAT + "=?";
@@ -154,6 +155,25 @@ public class MtpDatabase {
private int beginSendObject(String path, int format, int parent,
int storage, long size, long modified) {
// first make sure the object does not exist
if (path != null) {
Cursor c = null;
try {
c = mMediaProvider.query(mObjectsUri, ID_PROJECTION, PATH_WHERE,
new String[] { path }, null);
if (c != null && c.getCount() > 0) {
Log.w(TAG, "file already exists in beginSendObject: " + path);
return -1;
}
} catch (RemoteException e) {
Log.e(TAG, "RemoteException in beginSendObject", e);
} finally {
if (c != null) {
c.close();
}
}
}
mDatabaseModified = true;
ContentValues values = new ContentValues();
values.put(Files.FileColumns.DATA, path);

4
media/mtp/MtpServer.cpp
View File

@@ -683,10 +683,6 @@ MtpResponseCode MtpServer::doSendObjectInfo() {
path += "/";
path += (const char *)name;
// file should not already exist
if (access(path, R_OK) == 0)
return MTP_RESPONSE_GENERAL_ERROR;
// check space first
if (mSendObjectFileSize > storage->getFreeSpace())
return MTP_RESPONSE_STORAGE_FULL;