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

Merge "MTP: Fixes to allow file transfers > 4 gigabytes"

Browse Source
This commit is contained in:
Mike Lockwood
2010-11-17 15:00:10 -08:00
committed by Android (Google) Code Review
parent 6c97eba1b7 413577d860
commit ec155fcf81
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,7 +164,7 @@ public class MtpDatabase {
}
}
private void endSendObject(String path, int handle, int format, boolean succeeded) {
private void endSendObject(String path, int handle, int format, long actualSize, boolean succeeded) {
if (succeeded) {
// handle abstract playlists separately
// they do not exist in the file system so don't use the media scanner here
@@ -192,6 +192,18 @@ public class MtpDatabase {
Log.e(TAG, "RemoteException in endSendObject", e);
}
} else {
if (actualSize >= 0) {
// update size if necessary
ContentValues values = new ContentValues();
values.put(Files.FileColumns.SIZE, actualSize);
try {
String[] whereArgs = new String[] { Integer.toString(handle) };
mMediaProvider.update(mObjectsUri, values, ID_WHERE, whereArgs);
} catch (RemoteException e) {
Log.e(TAG, "RemoteException in mMediaProvider.update", e);
}
}
mMediaScanner.scanMtpFile(path, mVolumeName, handle, format);
}
} else {

7
media/jni/android_media_MtpDatabase.cpp
View File

@@ -99,6 +99,7 @@ public:
virtual void endSendObject(const char* path,
MtpObjectHandle handle,
MtpObjectFormat format,
int64_t actualSize,
bool succeeded);
virtual MtpObjectHandleList* getObjectList(MtpStorageID storageID,
@@ -235,11 +236,11 @@ MtpObjectHandle MyMtpDatabase::beginSendObject(const char* path,
}
void MyMtpDatabase::endSendObject(const char* path, MtpObjectHandle handle,
MtpObjectFormat format, bool succeeded) {
MtpObjectFormat format, int64_t actualSize, bool succeeded) {
JNIEnv* env = AndroidRuntime::getJNIEnv();
jstring pathStr = env->NewStringUTF(path);
env->CallVoidMethod(mDatabase, method_endSendObject, pathStr,
(jint)handle, (jint)format, (jboolean)succeeded);
(jint)handle, (jint)format, (jlong)actualSize, (jboolean)succeeded);
if (pathStr)
env->DeleteLocalRef(pathStr);
@@ -1076,7 +1077,7 @@ int register_android_media_MtpDatabase(JNIEnv *env)
LOGE("Can't find beginSendObject");
return -1;
}
method_endSendObject = env->GetMethodID(clazz, "endSendObject", "(Ljava/lang/String;IIZ)V");
method_endSendObject = env->GetMethodID(clazz, "endSendObject", "(Ljava/lang/String;IIJZ)V");
if (method_endSendObject == NULL) {
LOGE("Can't find endSendObject");
return -1;

1
media/mtp/MtpDatabase.h
View File

@@ -42,6 +42,7 @@ public:
virtual void endSendObject(const char* path,
MtpObjectHandle handle,
MtpObjectFormat format,
int64_t size,
bool succeeded) = 0;
virtual MtpObjectHandleList* getObjectList(MtpStorageID storageID,

10
media/mtp/MtpServer.cpp
View File

@@ -664,6 +664,7 @@ MtpResponseCode MtpServer::doSendObject() {
MtpResponseCode result = MTP_RESPONSE_OK;
mode_t mask;
int ret;
uint64_t actualSize = -1;
if (mSendObjectHandle == kInvalidObjectHandle) {
LOGE("Expected SendObjectInfo before SendObject");
@@ -706,11 +707,18 @@ MtpResponseCode MtpServer::doSendObject() {
result = MTP_RESPONSE_TRANSACTION_CANCELLED;
else
result = MTP_RESPONSE_GENERAL_ERROR;
} else if (mSendObjectFileSize == 0xFFFFFFFF) {
// actual size is likely > 4 gig so stat the file to compute actual length
struct stat s;
if (lstat(mSendObjectFilePath, &s) == 0) {
actualSize = s.st_size;
LOGD("actualSize: %lld\n", actualSize);
}
}
done:
mDatabase->endSendObject(mSendObjectFilePath, mSendObjectHandle, mSendObjectFormat,
result == MTP_RESPONSE_OK);
actualSize, result == MTP_RESPONSE_OK);
mSendObjectHandle = kInvalidObjectHandle;
mSendObjectFormat = 0;
return result;