summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMike Lockwoood <lockwood@google.com>2013-02-08 21:51:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-08 21:51:43 +0000
commit2b02df2df65dd12162bc7b3a2ef135bbce8ed0a7 (patch)
tree3efa1d517f317e9171eed91370a18d381cca4536 /media
parent90cede87c5a0176574961a4a57589eb217ac1873 (diff)
parent38fb629c46efb74517332696d5d117f4466fa3f0 (diff)
downloadframeworks_av-2b02df2df65dd12162bc7b3a2ef135bbce8ed0a7.zip
frameworks_av-2b02df2df65dd12162bc7b3a2ef135bbce8ed0a7.tar.gz
frameworks_av-2b02df2df65dd12162bc7b3a2ef135bbce8ed0a7.tar.bz2
Merge "MTP: Write initial data to correct file offset in SendPartialObject"
Diffstat (limited to 'media')
-rw-r--r--media/mtp/MtpServer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index 662a93d..8568dfc 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -1118,7 +1118,7 @@ MtpResponseCode MtpServer::doSendPartialObject() {
int initialData = ret - MTP_CONTAINER_HEADER_SIZE;
if (initialData > 0) {
- ret = write(edit->mFD, mData.getData(), initialData);
+ ret = pwrite(edit->mFD, mData.getData(), initialData, offset);
offset += initialData;
length -= initialData;
}